===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/alloc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/sudo/Attic/alloc.c	2007/10/17 04:26:04	1.10
--- src/usr.bin/sudo/Attic/alloc.c	2008/11/14 11:58:08	1.11
***************
*** 1,5 ****
  /*
!  * Copyright (c) 1999-2005 Todd C. Miller <Todd.Miller@courtesan.com>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,6 ----
  /*
!  * Copyright (c) 1999-2005, 2007
!  *	Todd C. Miller <Todd.Miller@courtesan.com>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 41,51 ****
  #if defined(HAVE_MALLOC_H) && !defined(STDC_HEADERS)
  # include <malloc.h>
  #endif /* HAVE_MALLOC_H && !STDC_HEADERS */
- #ifdef HAVE_ERR_H
- # include <err.h>
- #else
- # include "emul/err.h"
- #endif /* HAVE_ERR_H */
  #ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
  #endif
--- 42,47 ----
***************
*** 53,59 ****
  #include "sudo.h"
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: alloc.c,v 1.23.2.4 2007/09/11 12:20:15 millert Exp $";
  #endif /* lint */
  
  /*
--- 49,55 ----
  #include "sudo.h"
  
  #ifndef lint
! __unused static const char rcsid[] = "$Sudo: alloc.c,v 1.33 2008/11/09 14:13:12 millert Exp $";
  #endif /* lint */
  
  /*
***************
*** 74,90 ****
   * emalloc() calls the system malloc(3) and exits with an error if
   * malloc(3) fails.
   */
! VOID *
  emalloc(size)
      size_t size;
  {
!     VOID *ptr;
  
      if (size == 0)
! 	errx(1, "internal error, tried to emalloc(0)");
  
!     if ((ptr = (VOID *) malloc(size)) == NULL)
! 	errx(1, "unable to allocate memory");
      return(ptr);
  }
  
--- 70,86 ----
   * emalloc() calls the system malloc(3) and exits with an error if
   * malloc(3) fails.
   */
! void *
  emalloc(size)
      size_t size;
  {
!     void *ptr;
  
      if (size == 0)
! 	errorx(1, "internal error, tried to emalloc(0)");
  
!     if ((ptr = malloc(size)) == NULL)
! 	errorx(1, "unable to allocate memory");
      return(ptr);
  }
  
***************
*** 92,112 ****
   * emalloc2() allocates nmemb * size bytes and exits with an error
   * if overflow would occur or if the system malloc(3) fails.
   */
! VOID *
  emalloc2(nmemb, size)
      size_t nmemb;
      size_t size;
  {
!     VOID *ptr;
  
      if (nmemb == 0 || size == 0)
! 	errx(1, "internal error, tried to emalloc2(0)");
      if (nmemb > SIZE_MAX / size)
! 	errx(1, "internal error, emalloc2() overflow");
  
      size *= nmemb;
!     if ((ptr = (VOID *) malloc(size)) == NULL)
! 	errx(1, "unable to allocate memory");
      return(ptr);
  }
  
--- 88,108 ----
   * emalloc2() allocates nmemb * size bytes and exits with an error
   * if overflow would occur or if the system malloc(3) fails.
   */
! void *
  emalloc2(nmemb, size)
      size_t nmemb;
      size_t size;
  {
!     void *ptr;
  
      if (nmemb == 0 || size == 0)
! 	errorx(1, "internal error, tried to emalloc2(0)");
      if (nmemb > SIZE_MAX / size)
! 	errorx(1, "internal error, emalloc2() overflow");
  
      size *= nmemb;
!     if ((ptr = malloc(size)) == NULL)
! 	errorx(1, "unable to allocate memory");
      return(ptr);
  }
  
***************
*** 115,132 ****
   * realloc(3) fails.  You can call erealloc() with a NULL pointer even
   * if the system realloc(3) does not support this.
   */
! VOID *
  erealloc(ptr, size)
!     VOID *ptr;
      size_t size;
  {
  
      if (size == 0)
! 	errx(1, "internal error, tried to erealloc(0)");
  
!     ptr = ptr ? (VOID *) realloc(ptr, size) : (VOID *) malloc(size);
      if (ptr == NULL)
! 	errx(1, "unable to allocate memory");
      return(ptr);
  }
  
--- 111,128 ----
   * realloc(3) fails.  You can call erealloc() with a NULL pointer even
   * if the system realloc(3) does not support this.
   */
! void *
  erealloc(ptr, size)
!     void *ptr;
      size_t size;
  {
  
      if (size == 0)
! 	errorx(1, "internal error, tried to erealloc(0)");
  
!     ptr = ptr ? realloc(ptr, size) : malloc(size);
      if (ptr == NULL)
! 	errorx(1, "unable to allocate memory");
      return(ptr);
  }
  
***************
*** 136,157 ****
   * You can call erealloc() with a NULL pointer even if the system realloc(3)
   * does not support this.
   */
! VOID *
  erealloc3(ptr, nmemb, size)
!     VOID *ptr;
      size_t nmemb;
      size_t size;
  {
  
      if (nmemb == 0 || size == 0)
! 	errx(1, "internal error, tried to erealloc3(0)");
      if (nmemb > SIZE_MAX / size)
! 	errx(1, "internal error, erealloc3() overflow");
  
      size *= nmemb;
!     ptr = ptr ? (VOID *) realloc(ptr, size) : (VOID *) malloc(size);
      if (ptr == NULL)
! 	errx(1, "unable to allocate memory");
      return(ptr);
  }
  
--- 132,153 ----
   * You can call erealloc() with a NULL pointer even if the system realloc(3)
   * does not support this.
   */
! void *
  erealloc3(ptr, nmemb, size)
!     void *ptr;
      size_t nmemb;
      size_t size;
  {
  
      if (nmemb == 0 || size == 0)
! 	errorx(1, "internal error, tried to erealloc3(0)");
      if (nmemb > SIZE_MAX / size)
! 	errorx(1, "internal error, erealloc3() overflow");
  
      size *= nmemb;
!     ptr = ptr ? realloc(ptr, size) : malloc(size);
      if (ptr == NULL)
! 	errorx(1, "unable to allocate memory");
      return(ptr);
  }
  
***************
*** 199,205 ****
      va_end(ap);
  
      if (len == -1)
! 	errx(1, "unable to allocate memory");
      return(len);
  }
  
--- 195,201 ----
      va_end(ap);
  
      if (len == -1)
! 	errorx(1, "unable to allocate memory");
      return(len);
  }
  
***************
*** 216,222 ****
      int len;
  
      if ((len = vasprintf(ret, format, args)) == -1)
! 	errx(1, "unable to allocate memory");
      return(len);
  }
  
--- 212,218 ----
      int len;
  
      if ((len = vasprintf(ret, format, args)) == -1)
! 	errorx(1, "unable to allocate memory");
      return(len);
  }
  
***************
*** 225,231 ****
   */
  void
  efree(ptr)
!     VOID *ptr;
  {
      if (ptr != NULL)
  	free(ptr);
--- 221,227 ----
   */
  void
  efree(ptr)
!     void *ptr;
  {
      if (ptr != NULL)
  	free(ptr);