Commit 5b72eb0b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Some of Doug Kaufman's changes for the DOS port

parent 6dd4c13b

lib/getpass.c

+3 −5
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) 
  char infp_fclose = 0;

  FILE *outfp;

  RETSIGTYPE (*sigint)();

#if !defined(__EMX__) && !defined(__DJGPP__)

#ifdef SIGTSTP

  RETSIGTYPE (*sigtstp)();

#endif

  size_t bytes_read;
@@ -117,9 +117,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) 
#endif



  sigint = signal(SIGINT, SIG_IGN);

  /* 20000318 mgs

   * this is needed by the emx system, SIGTSTP is not a supported signal */

#if !defined(__EMX__) && !defined(__DJGPP__)

#ifdef SIGTSTP

  sigtstp = signal(SIGTSTP, SIG_IGN);

#endif
@@ -181,7 +179,7 @@ char *getpass_r(const char *prompt, char *buffer, size_t buflen) 
#endif

  

  signal(SIGINT, sigint);

#if !defined(__EMX__) && !defined(__DJGPP__)

#ifdef SIGTSTP

  signal(SIGTSTP, sigtstp);

#endif

lib/setup.h

+7 −0
Original line number Diff line number Diff line
@@ -145,6 +145,13 @@ defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) 
#define sread(x,y,z)      read_s(x,y,z)

#define swrite(x,y,z)     write_s(x,y,z)

#define select(n,r,w,x,t) select_s(n,r,w,x,t)

#define ioctl(x,y,z) ioctlsocket(x,y,(char *)(z))

#define IOCTL_3_ARGS

#include <tcp.h>

#ifdef word

#undef word

#endif



#else



#define sclose(x) close(x)

src/main.c

+12 −6
Original line number Diff line number Diff line
@@ -432,10 +432,10 @@ static void help(void) 
       "                    Overrides -n and --netrc-optional\n"

       " -U/--proxy-user <user[:password]> Specify Proxy authentication\n"

       " -v/--verbose       Makes the operation more talkative\n"

#ifdef DJGPP

       "                    Also enables Watt-32 debugging\n"

#endif

       " -V/--version       Outputs version number then quits");

#ifdef __DJGPP__

  puts("    --wdebug        Turns on WATT-32 debugging under DJGPP");

#endif

  puts(" -w/--write-out [format] What to output after completion\n"

       " -x/--proxy <host[:port]>  Use proxy. (Default port is 1080)\n"

       "    --random-file <file> File to use for reading random data from (SSL)\n"
@@ -1067,6 +1067,9 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ 
    {"5m", "ntlm",       FALSE},

    {"5n", "basic",      FALSE},

    {"5o", "anyauth",    FALSE},

#ifdef __DJGPP__

    {"5p", "wdebug",     FALSE},

#endif

    {"0", "http1.0",     FALSE},

    {"1", "tlsv1",       FALSE},

    {"2", "sslv2",       FALSE},
@@ -1311,6 +1314,12 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ 
	config->authtype = CURLAUTH_ANY;

	break;



#ifdef __DJGPP__

      case 'p': /* --wdebug */

        dbug_init();

        break;

#endif



      default: /* the URL! */

        {

          struct getout *url;
@@ -1723,9 +1732,6 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */ 
      cleanarg(nextarg);

      break;

    case 'v':

#ifdef DJGPP

      dbug_init();

#endif

      config->conf ^= CONF_VERBOSE; /* talk a lot */

      break;

    case 'V':

src/setup.h

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ int fileno( FILE *stream); 
#else



#ifdef DJGPP

#include <tcp.h>

#ifdef word

#undef word

#endif

#define DIR_CHAR      "/"

#define DOT_CHAR      "_"

#else

src/version.h

+1 −1
Original line number Diff line number Diff line 
#define CURL_NAME "curl"

#define CURL_VERSION "7.10.6-pre1"

#define CURL_VERSION "7.10.6-pre3"

#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "