1
0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00

getpass_r() is the new getpass name for thread-safe getpass!

This commit is contained in:
Daniel Stenberg 2000-11-06 23:18:50 +00:00
parent 36000e5287
commit 56548f9a13
3 changed files with 10 additions and 4 deletions

View File

@ -5,7 +5,7 @@
* *
* 1) This header remain in tact. * 1) This header remain in tact.
* 2) The prototype for getpass is not changed from: * 2) The prototype for getpass is not changed from:
* char *getpass(const char *prompt) * int getpass_r(const char *prompt, char *buffer, int buflen)
* 3) This source code is not used outside of this(getpass.c) file. * 3) This source code is not used outside of this(getpass.c) file.
* 3) Any changes to this(getpass.c) source code are made publicly available. * 3) Any changes to this(getpass.c) source code are made publicly available.
* *
@ -68,7 +68,7 @@
# define perror(x) fprintf(stderr, "Error in: %s\n", x) # define perror(x) fprintf(stderr, "Error in: %s\n", x)
#endif #endif
int my_getpass(void *client, const char *prompt, char *buffer, int buflen) int getpass_r(const char *prompt, char *buffer, int buflen)
{ {
FILE *infp; FILE *infp;
FILE *outfp; FILE *outfp;
@ -181,7 +181,7 @@ int my_getpass(void *client, const char *prompt, char *buffer, int buflen)
#else /* WIN32 */ #else /* WIN32 */
#include <stdio.h> #include <stdio.h>
#include <conio.h> #include <conio.h>
int my_getpass(void *client, const char *prompt, char *buffer, int buflen) int getpass_r(const char *prompt, char *buffer, int buflen)
{ {
int i; int i;
printf("%s", prompt); printf("%s", prompt);

View File

@ -3,6 +3,6 @@
/* /*
* Returning non-zero will abort the continued operation! * Returning non-zero will abort the continued operation!
*/ */
int my_getpass(void *client, char *prompt, char* buffer, int buflen ); int getpass_r(char *prompt, char* buffer, int buflen );
#endif #endif

View File

@ -264,6 +264,12 @@ CURLcode curl_close(CURL *curl)
return CURLE_OK; return CURLE_OK;
} }
int my_getpass(void *clientp, char *prompt, char* buffer, int buflen )
{
return getpass_r(prompt, buffer, buflen);
}
CURLcode curl_open(CURL **curl, char *url) CURLcode curl_open(CURL **curl, char *url)
{ {
/* We don't yet support specifying the URL at this point */ /* We don't yet support specifying the URL at this point */