httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@locus.apache.org
Subject cvs commit: apache-2.0/src/support htpasswd.c
Date Thu, 04 May 2000 00:46:52 GMT
fielding    00/05/03 17:46:52

  Modified:    src/support htpasswd.c
  Log:
  Get rid of warning by including crypt.h when available.
  Make tmpnam stuff less complex.
  
  Revision  Changes    Path
  1.12      +7 -5      apache-2.0/src/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/support/htpasswd.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- htpasswd.c	2000/05/03 17:55:38	1.11
  +++ htpasswd.c	2000/05/04 00:46:51	1.12
  @@ -86,6 +86,10 @@
   #include "ap_sha1.h"
   #include <signal.h>
   
  +#ifdef HAVE_CRYPT_H
  +#include <crypt.h>
  +#endif
  +
   #ifdef WIN32
   #include <conio.h>
   #define unlink _unlink
  @@ -124,6 +128,8 @@
    */
   #ifdef L_tmpnam
   static char tname_buf[L_tmpnam];
  +#else
  +static char *tname_buf = NULL;
   #endif
   
   /*
  @@ -526,12 +532,8 @@
        * to add or update.  Let's do it..
        */
       errno = 0;
  -#ifdef L_tmpnam
       tempfilename = tmpnam(tname_buf);
  -#else   /* def L_tmpnam */
  -    tempfilename = tmpnam(NULL);
  -#endif  /* def L_tmpnam */
  -    if ((tempfilename == NULL) || (strlen(tempfilename) == 0)) {
  +    if ((tempfilename == NULL) || (*tempfilename == '\0')) {
   	fprintf(stderr, "%s: unable to generate temporary filename\n",
   		argv[0]);
   	if (errno == 0) {
  
  
  

Mime
View raw message