[BACK]Return to res_query.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libc / resolv

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libc/resolv/res_query.c between version 1.11 and 1.11.14.1

version 1.11, 2008/06/21 23:37:53 version 1.11.14.1, 2011/01/09 20:43:29
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
   
 /*  /*
    * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
    * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
    *
    * Permission to use, copy, modify, and/or distribute this software for any
    * purpose with or without fee is hereby granted, provided that the above
    * copyright notice and this permission notice appear in all copies.
    *
    * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
    * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
    * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
    * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
    * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
    * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
    * PERFORMANCE OF THIS SOFTWARE.
    */
   
   /*
  * Copyright (c) 1988, 1993   * Copyright (c) 1988, 1993
  *    The Regents of the University of California.  All rights reserved.   *    The Regents of the University of California.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
  * are met:   * are met:
Line 19 
Line 36 
  * 4. Neither the name of the University nor the names of its contributors   * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software   *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.   *    without specific prior written permission.
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND   * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
Line 35 
Line 52 
   
 /*  /*
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.   * Portions Copyright (c) 1993 by Digital Equipment Corporation.
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies, and that   * copyright notice and this permission notice appear in all copies, and that
  * the name of Digital Equipment Corporation not be used in advertising or   * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without   * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.   * specific, written prior permission.
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL   * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES   * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT   * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
Line 74 
Line 91 
 #if defined(LIBC_SCCS) && !defined(lint)  #if defined(LIBC_SCCS) && !defined(lint)
 #ifdef notdef  #ifdef notdef
 static const char sccsid[] = "@(#)res_query.c   8.1 (Berkeley) 6/4/93";  static const char sccsid[] = "@(#)res_query.c   8.1 (Berkeley) 6/4/93";
 static const char rcsid[] = "Id: res_query.c,v 1.8.672.2 2008/04/03 10:49:22 marka Exp";  static const char rcsid[] = "Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp";
 #else  #else
 __RCSID("$NetBSD$");  __RCSID("$NetBSD$");
 #endif  #endif
Line 137  res_nquery(res_state statp,
Line 154  res_nquery(res_state statp,
 {  {
         u_char buf[MAXPACKET];          u_char buf[MAXPACKET];
         HEADER *hp = (HEADER *)(void *)answer;          HEADER *hp = (HEADER *)(void *)answer;
         int n;  
         u_int oflags;          u_int oflags;
         u_char *rdata;          u_char *rdata;
           int n;
   
         oflags = statp->_flags;          oflags = statp->_flags;
   
Line 437  res_hostalias(const res_state statp, con
Line 454  res_hostalias(const res_state statp, con
         file = getenv("HOSTALIASES");          file = getenv("HOSTALIASES");
         if (file == NULL || (fp = fopen(file, "r")) == NULL)          if (file == NULL || (fp = fopen(file, "r")) == NULL)
                 return (NULL);                  return (NULL);
         setbuf(fp, NULL);  
         buf[sizeof(buf) - 1] = '\0';          buf[sizeof(buf) - 1] = '\0';
         while (fgets(buf, sizeof(buf), fp)) {          while (fgets(buf, sizeof(buf), fp)) {
                 for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)                  for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.11.14.1

CVSweb <webmaster@jp.NetBSD.org>