Commit 1b0d7396 authored by Roy T. Fielding's avatar Roy T. Fielding
Browse files

Get rid of warning by including crypt.h when available. 

Make tmpnam stuff less complex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85134 13f79535-47bb-0310-9956-ffa450edef68
parent 3d87e364

support/htpasswd.c

+7 −5
Original line number Diff line number Diff line
@@ -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 @@ static char *tempfilename; 
 */

#ifdef L_tmpnam

static char tname_buf[L_tmpnam];

#else

static char *tname_buf = NULL;

#endif



/*
@@ -526,12 +532,8 @@ int main(int argc, char *argv[]) 
     * 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) {