Loading include/curl/curl.h +3 −3 Original line number Diff line number Diff line Loading @@ -123,6 +123,7 @@ typedef size_t (*curl_read_callback)(char *buffer, size_t nitems, void *instream); /* not used since 7.10.8, will be removed in a future release */ typedef int (*curl_passwd_callback)(void *clientp, const char *prompt, char *buffer, Loading Loading @@ -503,11 +504,10 @@ typedef enum { this option is used only if SSL_VERIFYPEER is true */ CINIT(CAINFO, OBJECTPOINT, 65), /* Function pointer to replace the internal password prompt */ /* OBSOLETE since 7.10.8 */ CINIT(PASSWDFUNCTION, FUNCTIONPOINT, 66), /* Custom pointer that gets passed as first argument to the password function */ /* OBSOLETE since 7.10.8 */ CINIT(PASSWDDATA, OBJECTPOINT, 67), /* Maximum number of http redirects to follow */ Loading lib/Makefile.am +2 −2 Original line number Diff line number Diff line Loading @@ -64,13 +64,13 @@ endif libcurl_la_LDFLAGS = $(UNDEF) $(VERSION) $(ARESLIB) libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c \ libcurl_la_SOURCES = arpa_telnet.h file.c netrc.h timeval.c \ base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c \ hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c \ http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h \ getdate.c if2ip.h speedcheck.h urldata.h getdate.h ldap.c ssluse.c \ version.c getenv.c ldap.h ssluse.h escape.c mprintf.c telnet.c escape.h \ getpass.c netrc.c telnet.h getinfo.c getinfo.h transfer.c strequal.c \ netrc.c telnet.h getinfo.c getinfo.h transfer.c strequal.c \ strequal.h easy.c security.h security.c krb4.c krb4.h memdebug.c \ memdebug.h inet_ntoa_r.h http_chunks.c http_chunks.h strtok.c strtok.h \ connect.c connect.h llist.c llist.h hash.c hash.h multi.c \ Loading lib/getpass.cdeleted 100644 → 0 +0 −224 Original line number Diff line number Diff line /* ============================================================================ * Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al. * * Redistribution and use are freely permitted provided that: * * 1) This header remain in tact. * 2) The prototypes for getpass and getpass_r are not changed from: * char *getpass(const char *prompt) * char *getpass_r(const char *prompt, char* buffer, int buflen) * 3) This source code is not used outside of this(getpass.c) file. * 4) Any changes to this(getpass.c) source code are made publicly available. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * * $Id$ * * The spirit of this license is to allow use of this source code in any * project be it open or closed but still encourage the use of the open, * library based equivilents. * * Author(s): * Angus Mackay <amackay@gus.ml.org> * * Contributor(s): * Daniel Stenberg <daniel@haxx.se> */ #include "setup.h" /* setup.h is required for read() prototype */ #ifndef HAVE_GETPASS_R #ifndef WIN32 #ifdef VMS #include <stdio.h> #include <string.h> #include descrip #include starlet #include iodef #include iosbdef char *getpass_r(const char *prompt, char *buffer, size_t buflen) { long sts; short chan; struct _iosb iosb; $DESCRIPTOR(ttdesc, "TT"); buffer[0]='\0'; if ((sts = sys$assign(&ttdesc, &chan,0,0)) & 1) { if (((sts = sys$qiow(0, chan, IO$_READPROMPT | IO$M_NOECHO, &iosb, 0, 0, buffer, buflen, 0, 0, prompt, strlen(prompt))) & 1) && (iosb.iosb$w_status&1)) { buffer[iosb.iosb$w_bcnt] = '\0'; } sts = sys$dassgn(chan); } return buffer; /* we always return success */ } #else /* VMS */ #ifdef HAVE_TERMIOS_H # if !defined(HAVE_TCGETATTR) && !defined(HAVE_TCSETATTR) # undef HAVE_TERMIOS_H # endif #endif #ifndef RETSIGTYPE # define RETSIGTYPE void #endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #include <stdio.h> #include <signal.h> #ifdef HAVE_TERMIOS_H # include <termios.h> #else # ifdef HAVE_TERMIO_H # include <termio.h> # else # endif #endif /* The last #include file should be: */ #ifdef CURLDEBUG #include "memdebug.h" #endif char *getpass_r(const char *prompt, char *buffer, size_t buflen) { FILE *infp; char infp_fclose = 0; FILE *outfp; RETSIGTYPE (*sigint)(); #ifdef SIGTSTP RETSIGTYPE (*sigtstp)(); #endif size_t bytes_read; int infd; int outfd; #ifdef HAVE_TERMIOS_H struct termios orig; struct termios noecho; #else # ifdef HAVE_TERMIO_H struct termio orig; struct termio noecho; # else # endif #endif sigint = signal(SIGINT, SIG_IGN); #ifdef SIGTSTP sigtstp = signal(SIGTSTP, SIG_IGN); #endif infp=fopen("/dev/tty", "r"); if( NULL == infp ) infp = stdin; else infp_fclose = 1; outfp = stderr; infd = fileno(infp); outfd = fileno(outfp); /* dissable echo */ #ifdef HAVE_TERMIOS_H tcgetattr(outfd, &orig); noecho = orig; noecho.c_lflag &= ~ECHO; tcsetattr(outfd, TCSANOW, &noecho); #else # ifdef HAVE_TERMIO_H ioctl(outfd, TCGETA, &orig); noecho = orig; noecho.c_lflag &= ~ECHO; ioctl(outfd, TCSETA, &noecho); # else # endif #endif fputs(prompt, outfp); fflush(outfp); bytes_read=read(infd, buffer, buflen); buffer[bytes_read > 0 ? (bytes_read -1) : 0] = '\0'; /* print a new line if needed */ #ifdef HAVE_TERMIOS_H fputs("\n", outfp); #else # ifdef HAVE_TERMIO_H fputs("\n", outfp); # else # endif #endif /* * reset term charectaristics, use TCSAFLUSH incase the * user types more than buflen */ #ifdef HAVE_TERMIOS_H tcsetattr(outfd, TCSAFLUSH, &orig); #else # ifdef HAVE_TERMIO_H ioctl(outfd, TCSETA, &orig); # else # endif #endif signal(SIGINT, sigint); #ifdef SIGTSTP signal(SIGTSTP, sigtstp); #endif if(infp_fclose) fclose(infp); return buffer; /* we always return success */ } #endif /* VMS */ #else /* WIN32 */ #include <stdio.h> #include <conio.h> char *getpass_r(const char *prompt, char *buffer, int buflen) { int i; printf("%s", prompt); for(i=0; i<buflen; i++) { buffer[i] = getch(); if ( buffer[i] == '\r' ) { buffer[i] = 0; break; } } /* if user didn't hit ENTER, terminate buffer */ if (i==buflen) buffer[buflen-1]=0; return buffer; /* we always return success */ } #endif #endif /* ifndef HAVE_GETPASS_R */ #if 0 /* for consistensy, here's the old-style function: */ char *getpass(const char *prompt) { static char buf[256]; return getpass_r(prompt, buf, sizeof(buf)); } #endif lib/getpass.hdeleted 100644 → 0 +0 −35 Original line number Diff line number Diff line #ifndef __GETPASS_H #define __GETPASS_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. * * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * * $Id$ ***************************************************************************/ #ifndef HAVE_GETPASS_R /* If there's a system-provided function named like this, we trust it is also found in one of the standard headers. */ /* * Returning NULL will abort the continued operation! */ char* getpass_r(const char *prompt, char* buffer, size_t buflen ); #endif #endif lib/transfer.c +0 −1 Original line number Diff line number Diff line Loading @@ -86,7 +86,6 @@ #include "transfer.h" #include "sendf.h" #include "speedcheck.h" #include "getpass.h" #include "progress.h" #include "getdate.h" #include "http.h" Loading Loading
include/curl/curl.h +3 −3 Original line number Diff line number Diff line Loading @@ -123,6 +123,7 @@ typedef size_t (*curl_read_callback)(char *buffer, size_t nitems, void *instream); /* not used since 7.10.8, will be removed in a future release */ typedef int (*curl_passwd_callback)(void *clientp, const char *prompt, char *buffer, Loading Loading @@ -503,11 +504,10 @@ typedef enum { this option is used only if SSL_VERIFYPEER is true */ CINIT(CAINFO, OBJECTPOINT, 65), /* Function pointer to replace the internal password prompt */ /* OBSOLETE since 7.10.8 */ CINIT(PASSWDFUNCTION, FUNCTIONPOINT, 66), /* Custom pointer that gets passed as first argument to the password function */ /* OBSOLETE since 7.10.8 */ CINIT(PASSWDDATA, OBJECTPOINT, 67), /* Maximum number of http redirects to follow */ Loading
lib/Makefile.am +2 −2 Original line number Diff line number Diff line Loading @@ -64,13 +64,13 @@ endif libcurl_la_LDFLAGS = $(UNDEF) $(VERSION) $(ARESLIB) libcurl_la_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c \ libcurl_la_SOURCES = arpa_telnet.h file.c netrc.h timeval.c \ base64.c file.h hostip.c progress.c timeval.h base64.h formdata.c \ hostip.h progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c \ http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h dict.h \ getdate.c if2ip.h speedcheck.h urldata.h getdate.h ldap.c ssluse.c \ version.c getenv.c ldap.h ssluse.h escape.c mprintf.c telnet.c escape.h \ getpass.c netrc.c telnet.h getinfo.c getinfo.h transfer.c strequal.c \ netrc.c telnet.h getinfo.c getinfo.h transfer.c strequal.c \ strequal.h easy.c security.h security.c krb4.c krb4.h memdebug.c \ memdebug.h inet_ntoa_r.h http_chunks.c http_chunks.h strtok.c strtok.h \ connect.c connect.h llist.c llist.h hash.c hash.h multi.c \ Loading
lib/getpass.cdeleted 100644 → 0 +0 −224 Original line number Diff line number Diff line /* ============================================================================ * Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al. * * Redistribution and use are freely permitted provided that: * * 1) This header remain in tact. * 2) The prototypes for getpass and getpass_r are not changed from: * char *getpass(const char *prompt) * char *getpass_r(const char *prompt, char* buffer, int buflen) * 3) This source code is not used outside of this(getpass.c) file. * 4) Any changes to this(getpass.c) source code are made publicly available. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * ============================================================================ * * $Id$ * * The spirit of this license is to allow use of this source code in any * project be it open or closed but still encourage the use of the open, * library based equivilents. * * Author(s): * Angus Mackay <amackay@gus.ml.org> * * Contributor(s): * Daniel Stenberg <daniel@haxx.se> */ #include "setup.h" /* setup.h is required for read() prototype */ #ifndef HAVE_GETPASS_R #ifndef WIN32 #ifdef VMS #include <stdio.h> #include <string.h> #include descrip #include starlet #include iodef #include iosbdef char *getpass_r(const char *prompt, char *buffer, size_t buflen) { long sts; short chan; struct _iosb iosb; $DESCRIPTOR(ttdesc, "TT"); buffer[0]='\0'; if ((sts = sys$assign(&ttdesc, &chan,0,0)) & 1) { if (((sts = sys$qiow(0, chan, IO$_READPROMPT | IO$M_NOECHO, &iosb, 0, 0, buffer, buflen, 0, 0, prompt, strlen(prompt))) & 1) && (iosb.iosb$w_status&1)) { buffer[iosb.iosb$w_bcnt] = '\0'; } sts = sys$dassgn(chan); } return buffer; /* we always return success */ } #else /* VMS */ #ifdef HAVE_TERMIOS_H # if !defined(HAVE_TCGETATTR) && !defined(HAVE_TCSETATTR) # undef HAVE_TERMIOS_H # endif #endif #ifndef RETSIGTYPE # define RETSIGTYPE void #endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #include <stdio.h> #include <signal.h> #ifdef HAVE_TERMIOS_H # include <termios.h> #else # ifdef HAVE_TERMIO_H # include <termio.h> # else # endif #endif /* The last #include file should be: */ #ifdef CURLDEBUG #include "memdebug.h" #endif char *getpass_r(const char *prompt, char *buffer, size_t buflen) { FILE *infp; char infp_fclose = 0; FILE *outfp; RETSIGTYPE (*sigint)(); #ifdef SIGTSTP RETSIGTYPE (*sigtstp)(); #endif size_t bytes_read; int infd; int outfd; #ifdef HAVE_TERMIOS_H struct termios orig; struct termios noecho; #else # ifdef HAVE_TERMIO_H struct termio orig; struct termio noecho; # else # endif #endif sigint = signal(SIGINT, SIG_IGN); #ifdef SIGTSTP sigtstp = signal(SIGTSTP, SIG_IGN); #endif infp=fopen("/dev/tty", "r"); if( NULL == infp ) infp = stdin; else infp_fclose = 1; outfp = stderr; infd = fileno(infp); outfd = fileno(outfp); /* dissable echo */ #ifdef HAVE_TERMIOS_H tcgetattr(outfd, &orig); noecho = orig; noecho.c_lflag &= ~ECHO; tcsetattr(outfd, TCSANOW, &noecho); #else # ifdef HAVE_TERMIO_H ioctl(outfd, TCGETA, &orig); noecho = orig; noecho.c_lflag &= ~ECHO; ioctl(outfd, TCSETA, &noecho); # else # endif #endif fputs(prompt, outfp); fflush(outfp); bytes_read=read(infd, buffer, buflen); buffer[bytes_read > 0 ? (bytes_read -1) : 0] = '\0'; /* print a new line if needed */ #ifdef HAVE_TERMIOS_H fputs("\n", outfp); #else # ifdef HAVE_TERMIO_H fputs("\n", outfp); # else # endif #endif /* * reset term charectaristics, use TCSAFLUSH incase the * user types more than buflen */ #ifdef HAVE_TERMIOS_H tcsetattr(outfd, TCSAFLUSH, &orig); #else # ifdef HAVE_TERMIO_H ioctl(outfd, TCSETA, &orig); # else # endif #endif signal(SIGINT, sigint); #ifdef SIGTSTP signal(SIGTSTP, sigtstp); #endif if(infp_fclose) fclose(infp); return buffer; /* we always return success */ } #endif /* VMS */ #else /* WIN32 */ #include <stdio.h> #include <conio.h> char *getpass_r(const char *prompt, char *buffer, int buflen) { int i; printf("%s", prompt); for(i=0; i<buflen; i++) { buffer[i] = getch(); if ( buffer[i] == '\r' ) { buffer[i] = 0; break; } } /* if user didn't hit ENTER, terminate buffer */ if (i==buflen) buffer[buflen-1]=0; return buffer; /* we always return success */ } #endif #endif /* ifndef HAVE_GETPASS_R */ #if 0 /* for consistensy, here's the old-style function: */ char *getpass(const char *prompt) { static char buf[256]; return getpass_r(prompt, buf, sizeof(buf)); } #endif
lib/getpass.hdeleted 100644 → 0 +0 −35 Original line number Diff line number Diff line #ifndef __GETPASS_H #define __GETPASS_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2003, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. * * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * * $Id$ ***************************************************************************/ #ifndef HAVE_GETPASS_R /* If there's a system-provided function named like this, we trust it is also found in one of the standard headers. */ /* * Returning NULL will abort the continued operation! */ char* getpass_r(const char *prompt, char* buffer, size_t buflen ); #endif #endif
lib/transfer.c +0 −1 Original line number Diff line number Diff line Loading @@ -86,7 +86,6 @@ #include "transfer.h" #include "sendf.h" #include "speedcheck.h" #include "getpass.h" #include "progress.h" #include "getdate.h" #include "http.h" Loading
