7.18.2

condition were encountered.

CHANGES

@@ -7,6 +7,17 @@
                                   Changelog
 
 
+Version 7.18.2 (4 June 2008)
+
+Daniel Fandrich (3 Jun 2008)
+- Fixed a problem where telnet data would be lost if an EWOULDBLOCK
+  condition were encountered.
+
+Marty Kuhrt (1 Jun 2008)
+- Updated main.c to return CURLE_OK if PARAM_HELP_REQUESTED was returned
+  from getparameter instead of CURLE_FAILED_INIT.  No point in returning
+  an error if --help or --version were requested.
+
 Daniel Stenberg (28 May 2008)
 - Emil Romanus found a problem and helped me repeat it. It occured when using
   the curl_multi_socket() API with HTTP pipelining enabled and could lead to

RELEASE-NOTES

@@ -40,6 +40,7 @@ This release includes the following bugfixes:
  o follow redirect with only a new query string
  o SCP and SFTP memory leaks on aborted transfers
  o curl_multi_socket() and HTTP pipelining transfer stalls
+ o lost telnet data on an EWOULDBLOCK condition
 
 This release includes the following known bugs:
 

ares/CHANGES

@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* May 30 2008 (Yang Tse)
+
+- Brad House fixed a missing header file inclusion in adig sample program.
+
 Version 1.5.2 (May 29, 2008)
 
 * May 13 2008 (Daniel Stenberg)

ares/RELEASE-NOTES

@@ -1,21 +1,10 @@
-This is what's new and changed in the c-ares 1.5.2 release:
+This is what's new and changed in the c-ares 1.5.3 release:
 
- o code refactoring in ares_gethostbyaddr
+ o adig sample application compilation failure on some systems
- o improved checking of /dev/urandom in configure script
- o new sample application, acountry
- o improved MSVC6 dsp files
- o adig sample application supports NAPTR records
- o improved file seeding randomizer
- o improved parsing of resolver configuration files
- o updated configure script to remove autoconf 2.62 warnings
- o use monotonic time source if available
- o return all PTR-records when doing reverse lookups
- o millisecond resolution support for the timeout option
 
 Thanks go to these friendly people for their efforts and contributions:
 
- Erik Kline, Brad Spencer, Gisle Vanem, Alexey Simak, Eino Tuominen,
+ Brad House
- Eino Tuominen, Yang Tse, Doug Goldstein, Sebastian<at>basti79.de,
  and obviously Daniel Stenberg
 
 Have fun!

ares/adig.c

@@ -27,6 +27,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

ares/ares_version.h

@@ -5,11 +5,11 @@
 
 #define ARES_VERSION_MAJOR 1
 #define ARES_VERSION_MINOR 5
-#define ARES_VERSION_PATCH 2
+#define ARES_VERSION_PATCH 3
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
                        (ARES_VERSION_MINOR<<8)|\
                        (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.5.2-CVS"
+#define ARES_VERSION_STR "1.5.3-CVS"
 
 #ifdef  __cplusplus
 extern "C" {

docs/TheArtOfHttpScripting

@@ -1,5 +1,5 @@
 Online:  http://curl.haxx.se/docs/httpscripting.html
-Date:    December 9, 2004
+Date:    May 28, 2008
 
                 The Art Of Scripting HTTP Requests Using Curl
                 =============================================
@@ -137,6 +137,10 @@ Date:    December 9, 2004
   you need to replace that space with %20 etc. Failing to comply with this
   will most likely cause your data to be received wrongly and messed up.
 
+  Recent curl versions can in fact url-encode POST data for you, like this:
+
+        curl --data-urlencode "name=I am Daniel" www.example.com
+
  4.3 File Upload POST
 
   Back in late 1995 they defined an additional way to post data over HTTP. It
@@ -202,14 +206,14 @@ Date:    December 9, 2004
 
         curl -T uploadfile www.uploadhttp.com/receive.cgi
 
-6. Authentication
+6. HTTP Authentication
 
- Authentication is the ability to tell the server your username and password
+ HTTP Authentication is the ability to tell the server your username and
- so that it can verify that you're allowed to do the request you're doing. The
+ password so that it can verify that you're allowed to do the request you're
- Basic authentication used in HTTP (which is the type curl uses by default) is
+ doing. The Basic authentication used in HTTP (which is the type curl uses by
- *plain* *text* based, which means it sends username and password only
+ default) is *plain* *text* based, which means it sends username and password
- slightly obfuscated, but still fully readable by anyone that sniffs on the
+ only slightly obfuscated, but still fully readable by anyone that sniffs on
- network between you and the remote server.
+ the network between you and the remote server.
 
  To tell curl to use a user and password for authentication:
 
@@ -237,6 +241,10 @@ Date:    December 9, 2004
  able to watch your passwords if you pass them as plain command line
  options. There are ways to circumvent this.
 
+ It is worth noting that while this is how HTTP Authentication works, very
+ many web sites will not use this concept when they provide logins etc. See
+ the Web Login chapter further below for more details on that.
+
 7. Referer
 
  A HTTP request may include a 'referer' field (yes it is misspelled), which
@@ -407,7 +415,37 @@ Date:    December 9, 2004
 
         curl -H "Destination: http://moo.com/nowhere" http://url.com
 
-13. Debug
+13. Web Login
+
+ While not strictly just HTTP related, it still cause a lot of people problems
+ so here's the executive run-down of how the vast majority of all login forms
+ work and how to login to them using curl.
+
+ It can also be noted that to do this properly in an automated fashion, you
+ will most certainly need to script things and do multiple curl invokes etc.
+
+ First, servers mostly use cookies to track the logged-in status of the
+ client, so you will need to capture the cookies you receive in the
+ responses. Then, many sites also set a special cookie on the login page (to
+ make sure you got there through their login page) so you should make a habit
+ of first getting the login-form page to capture the cookies set there.
+
+ Some web-based login systems features various amounts of javascript, and
+ sometimes they use such code to set or modify cookie contents. Possibly they
+ do that to prevent programmed logins, like this manual describes how to...
+ Anyway, if reading the code isn't enough to let you repeat the behavior
+ manually, capturing the HTTP requests done by your browers and analyzing the
+ sent cookies is usually a working method to work out how to shortcut the
+ javascript need.
+
+ In the actual <form> tag for the login, lots of sites fill-in random/session
+ or otherwise secretly generated hidden tags and you may need to first capture
+ the HTML code for the login form and extract all the hidden fields to be able
+ to do a proper login POST. Remember that the contents need to be URL encoded
+ when sent in a normal POST.
+
+
+14. Debug
 
  Many times when you run curl on a site, you'll notice that the site doesn't
  seem to respond the same way to your curl requests as it does to your
@@ -437,7 +475,7 @@ Date:    December 9, 2004
  such as ethereal or tcpdump and check what headers that were sent and
  received by the browser. (HTTPS makes this technique inefficient.)
 
-14. References
+15. References
 
  RFC 2616 is a must to read if you want in-depth understanding of the HTTP
  protocol.

include/curl/curl.h

@@ -379,7 +379,7 @@ typedef enum {
   CURLE_WRITE_ERROR,             /* 23 */
   CURLE_OBSOLETE24,              /* 24 - NOT USED */
   CURLE_UPLOAD_FAILED,           /* 25 - failed upload "command" */
-  CURLE_READ_ERROR,              /* 26 - could open/read from file */
+  CURLE_READ_ERROR,              /* 26 - couldn't open/read from file */
   CURLE_OUT_OF_MEMORY,           /* 27 */
   /* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
            instead of a memory allocation error if CURL_DOES_CONVERSIONS

lib/ssh.c

@@ -2175,7 +2175,7 @@ static CURLcode ssh_do(struct connectdata *conn, bool *done)
    disconnecting operations that takes a while */
 static CURLcode scp_disconnect(struct connectdata *conn)
 {
-  CURLcode result;
+  CURLcode result = CURLE_OK;
 
   Curl_safefree(conn->data->state.proto.ssh);
   conn->data->state.proto.ssh = NULL;
@@ -2331,7 +2331,7 @@ static CURLcode sftp_doing(struct connectdata *conn,
    disconnecting operations that takes a while */
 static CURLcode sftp_disconnect(struct connectdata *conn)
 {
-  CURLcode result;
+  CURLcode result = CURLE_OK;
 
   DEBUGF(infof(conn->data, "SSH DISCONNECT starts now\n"));
 

lib/telnet.c

@@ -1117,6 +1117,46 @@ void telrcv(struct connectdata *conn,
   bufferflush();
 }
 
+/* Escape and send a telnet data block */
+/* TODO: write large chunks of data instead of one byte at a time */
+static CURLcode send_telnet_data(struct connectdata *conn,
+				 char *buffer, ssize_t nread)
+{
+  unsigned char outbuf[2];
+  ssize_t bytes_written, total_written;
+  int out_count;
+  CURLcode rc = CURLE_OK;
+
+  while(rc == CURLE_OK && nread--) {
+    outbuf[0] = *buffer++;
+    out_count = 1;
+    if(outbuf[0] == CURL_IAC)
+      outbuf[out_count++] = CURL_IAC;
+
+    total_written = 0;
+    do {
+      /* Make sure socket is writable to avoid EWOULDBLOCK condition */
+      struct pollfd pfd[1];
+      pfd[0].fd = conn->sock[FIRSTSOCKET];
+      pfd[0].events = POLLOUT;
+      switch (Curl_poll(pfd, 1, -1)) {
+	case -1:                    /* error, abort writing */
+	case 0:                     /* timeout (will never happen) */
+	  rc = CURLE_SEND_ERROR;
+	  break;
+	default:                    /* write! */
+	  bytes_written = 0;
+	  rc = Curl_write(conn, conn->sock[FIRSTSOCKET], outbuf+total_written,
+			  out_count-total_written, &bytes_written);
+	  total_written += bytes_written;
+	  break;
+      }
+    /* handle partial write */
+    } while (rc == CURLE_OK && total_written < out_count);
+  }
+  return rc;
+}
+
 static CURLcode telnet_done(struct connectdata *conn,
                                  CURLcode status, bool premature)
 {
@@ -1270,63 +1310,45 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
     switch(waitret) {
     case WAIT_TIMEOUT:
     {
-      unsigned char outbuf[2];
-      int out_count = 0;
-      ssize_t bytes_written;
-      char *buffer = buf;
-
       while(1) {
         if(!PeekNamedPipe(stdin_handle, NULL, 0, NULL, &readfile_read, NULL)) {
           keepon = FALSE;
+	  code = CURLE_READ_ERROR;
           break;
         }
-        nread = readfile_read;
 
-        if(!nread)
+        if(!readfile_read)
           break;
 
         if(!ReadFile(stdin_handle, buf, sizeof(data->state.buffer),
                      &readfile_read, NULL)) {
           keepon = FALSE;
+	  code = CURLE_READ_ERROR;
           break;
         }
-        nread = readfile_read;
 
-        while(nread--) {
+        code = send_telnet_data(conn, buf, readfile_read);
-          outbuf[0] = *buffer++;
+	if(code) {
-          out_count = 1;
+          keepon = FALSE;
-          if(outbuf[0] == CURL_IAC)
+	  break;
-            outbuf[out_count++] = CURL_IAC;
+	}
-
-          Curl_write(conn, conn->sock[FIRSTSOCKET], outbuf,
-                     out_count, &bytes_written);
-        }
       }
     }
     break;
 
     case WAIT_OBJECT_0 + 1:
     {
-      unsigned char outbuf[2];
-      int out_count = 0;
-      ssize_t bytes_written;
-      char *buffer = buf;
-
       if(!ReadFile(stdin_handle, buf, sizeof(data->state.buffer),
                    &readfile_read, NULL)) {
         keepon = FALSE;
+	code = CURLE_READ_ERROR;
         break;
       }
-      nread = readfile_read;
 
-      while(nread--) {
+      code = send_telnet_data(conn, buf, readfile_read);
-        outbuf[0] = *buffer++;
+      if(code) {
-        out_count = 1;
+	keepon = FALSE;
-        if(outbuf[0] == CURL_IAC)
+	break;
-          outbuf[out_count++] = CURL_IAC;
-
-        Curl_write(conn, conn->sock[FIRSTSOCKET], outbuf,
-                   out_count, &bytes_written);
       }
     }
     break;
@@ -1389,22 +1411,12 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done)
       break;
     default:                    /* read! */
       if(pfd[1].revents & POLLIN) { /* read from stdin */
-        unsigned char outbuf[2];
-        int out_count = 0;
-        ssize_t bytes_written;
-        char *buffer = buf;
-
         nread = read(0, buf, 255);
-
+        code = send_telnet_data(conn, buf, nread);
-        while(nread--) {
+	if(code) {
-          outbuf[0] = *buffer++;
+          keepon = FALSE;
-          out_count = 1;
+	  break;
-          if(outbuf[0] == CURL_IAC)
+	}
-            outbuf[out_count++] = CURL_IAC;
-
-          Curl_write(conn, conn->sock[FIRSTSOCKET], outbuf,
-                     out_count, &bytes_written);
-        }
       }
 
       if(pfd[0].revents & POLLIN) {

packages/vms/curlmsg.h

@@ -1,14 +1,14 @@
 /********************************************************************************************************************************/
-/* Created: 26-JUN-2007 15:36:24 by OpenVMS SDL EV1-60     */
+/* Created: 30-MAY-2008 14:11:08 by OpenVMS SDL EV1-60     */
-/* Source:  26-JUN-2007 15:35:25 $44$DKA200:[CURL.CURL-7_16_3.PACKAGES.VMS]curlm */
+/* Source:  30-MAY-2008 14:09:41 $44$DKA200:[CURL.CURL-7_18_2-20080530.PACKAGES. */
 /********************************************************************************************************************************/
 /*** MODULE $CURDEF ***/
 #pragma __member_alignment __save
 #pragma __nomember_alignment
 /*                                                                          */
-/* This SDL File Generated by VAX-11 Message V04-00 on 26-JUN-2007 15:35:25.21 */
+/* This SDL File Generated by VAX-11 Message V04-00 on 30-MAY-2008 14:09:41.93 */
 /*                                                                          */
-/* $ID: CURLMSG.MSG,V 1.5 2007-01-31 09:37:39 BAGDER EXP $                  */
+/* $ID: CURLMSG.MSG,V 1.6 2007-07-11 23:18:15 CURLVMS EXP $                 */
 /*                                                                          */
 /* THESE VMS ERROR CODES ARE GENERATED BY TAKING APART THE CURL.H           */
 /* FILE AND PUTTING ALL THE CURLE_* ENUM STUFF INTO THIS FILE,              */
@@ -18,8 +18,8 @@
 /*                                                                          */
 /* WITH THE EXCEPTION OF CURLE_OK, ALL OF THE MESSAGES ARE AT               */
 /* THE ERROR SEVERITY LEVEL.  WITH THE EXCEPTION OF                         */
-/* FTP_USER_PWD_INCORRECT, WHICH IS A SHORTENED FORM OF                     */
+/* PEER_FAILED_VERIF, WHICH IS A SHORTENED FORM OF                          */
-/* FTP_USER_PASSWORD_INCORRECT, THESE ARE THE SAME NAMES AS THE             */
+/* PEER_FAILED_VERIFICATION, THESE ARE THE SAME NAMES AS THE                */
 /* CURLE_ ONES IN INCLUDE/CURL.H.  THE MESSAGE UTILITY MANUAL STATES        */
 /* "THE COMBINED LENGTH OF THE PREFIX AND THE MESSAGE SYMBOL NAME CANNOT    */
 /* EXCEED 31 CHARACTERS."  WITH A PREFIX OF FIVE THAT LEAVES US WITH 26     */
@@ -32,76 +32,76 @@
 #define CURL_UNSUPPORTED_PROTOCOL 251756562
 #define CURL_FAILED_INIT 251756570
 #define CURL_URL_MALFORMAT 251756578
-#define CURL_URL_MALFORMAT_USER 251756586
+#define CURL_OBSOLETE4 251756586
 #define CURL_COULDNT_RESOLVE_PROXY 251756594
 #define CURL_COULDNT_RESOLVE_HOST 251756602
 #define CURL_COULDNT_CONNECT 251756610
 #define CURL_FTP_WEIRD_SERVER_REPLY 251756618
 #define CURL_FTP_ACCESS_DENIED 251756626
-#define CURL_FTP_USER_PWD_INCORRECT 251756634
+#define CURL_OBSOLETE10 251756634
 #define CURL_FTP_WEIRD_PASS_REPLY 251756642
-#define CURL_FTP_WEIRD_USER_REPLY 251756650
+#define CURL_OBSOLETE12 251756650
 #define CURL_FTP_WEIRD_PASV_REPLY 251756658
 #define CURL_FTP_WEIRD_227_FORMAT 251756666
 #define CURL_FTP_CANT_GET_HOST 251756674
-#define CURL_FTP_CANT_RECONNECT 251756682
+#define CURL_OBSOLETE16 251756682
-#define CURL_FTP_COULDNT_SET_BINARY 251756690
+#define CURL_FTP_COULDNT_SET_TYPE 251756690
 #define CURL_PARTIAL_FILE 251756698
 #define CURL_FTP_COULDNT_RETR_FILE 251756706
-#define CURL_FTP_WRITE_ERROR 251756714
+#define CURL_OBSOLETE20 251756714
-#define CURL_FTP_QUOTE_ERROR 251756722
+#define CURL_QUOTE_ERROR 251756722
 #define CURL_HTTP_RETURNED_ERROR 251756730
 #define CURL_WRITE_ERROR 251756738
-#define CURL_MALFORMAT_USER 251756746
+#define CURL_OBSOLETE24 251756746
-#define CURL_FTP_COULDNT_STOR_FILE 251756754
+#define CURL_UPLOAD_FAILED 251756754
 #define CURL_READ_ERROR 251756762
 #define CURL_OUT_OF_MEMORY 251756770
 #define CURL_OPERATION_TIMEOUTED 251756778
-#define CURL_FTP_COULDNT_SET_ASCII 251756786
+#define CURL_OBSOLETE29 251756786
 #define CURL_FTP_PORT_FAILED 251756794
 #define CURL_FTP_COULDNT_USE_REST 251756802
-#define CURL_FTP_COULDNT_GET_SIZE 251756810
+#define CURL_OBSOLETE32 251756810
-#define CURL_HTTP_RANGE_ERROR 251756818
+#define CURL_RANGE_ERROR 251756818
 #define CURL_HTTP_POST_ERROR 251756826
 #define CURL_SSL_CONNECT_ERROR 251756834
 #define CURL_BAD_DOWNLOAD_RESUME 251756842
 #define CURL_FILE_COULDNT_READ_FILE 251756850
 #define CURL_LDAP_CANNOT_BIND 251756858
 #define CURL_LDAP_SEARCH_FAILED 251756866
-#define CURL_LIBRARY_NOT_FOUND 251756874
+#define CURL_OBSOLETE40 251756874
 #define CURL_FUNCTION_NOT_FOUND 251756882
 #define CURL_ABORTED_BY_CALLBACK 251756890
 #define CURL_BAD_FUNCTION_ARGUMENT 251756898
-#define CURL_BAD_CALLING_ORDER 251756906
+#define CURL_OBSOLETE44 251756906
 #define CURL_INTERFACE_FAILED 251756914
-#define CURL_BAD_PASSWORD_ENTERED 251756922
+#define CURL_OBSOLETE46 251756922
 #define CURL_TOO_MANY_REDIRECTS 251756930
 #define CURL_UNKNOWN_TELNET_OPTION 251756938
 #define CURL_TELNET_OPTION_SYNTAX 251756946
-#define CURL_OBSOLETE 251756954
+#define CURL_OBSOLETE50 251756954
-#define CURL_SSL_PEER_CERTIFICATE 251756962
+#define CURL_PEER_FAILED_VERIF 251756962
 #define CURL_GOT_NOTHING 251756970
 #define CURL_SSL_ENGINE_NOTFOUND 251756978
 #define CURL_SSL_ENGINE_SETFAILED 251756986
 #define CURL_SEND_ERROR 251756994
 #define CURL_RECV_ERROR 251757002
-#define CURL_SHARE_IN_USE 251757010
+#define CURL_OBSOLETE57 251757010
 #define CURL_SSL_CERTPROBLEM 251757018
 #define CURL_SSL_CIPHER 251757026
 #define CURL_SSL_CACERT 251757034
 #define CURL_BAD_CONTENT_ENCODING 251757042
 #define CURL_LDAP_INVALID_URL 251757050
 #define CURL_FILESIZE_EXCEEDED 251757058
-#define CURL_FTP_SSL_FAILED 251757066
+#define CURL_USE_SSL_FAILED 251757066
 #define CURL_SEND_FAIL_REWIND 251757074
 #define CURL_SSL_ENGINE_INITFAILED 251757082
 #define CURL_LOGIN_DENIED 251757090
 #define CURL_TFTP_NOTFOUND 251757098
 #define CURL_TFTP_PERM 251757106
-#define CURL_TFTP_DISKFULL 251757114
+#define CURL_REMOTE_DISK_FULL 251757114
 #define CURL_TFTP_ILLEGAL 251757122
 #define CURL_TFTP_UNKNOWNID 251757130
-#define CURL_TFTP_EXISTS 251757138
+#define CURL_REMOTE_FILE_EXISTS 251757138
 #define CURL_TFTP_NOSUCHUSER 251757146
 #define CURL_CONV_FAILED 251757154
 #define CURL_CONV_REQD 251757162
@@ -109,6 +109,7 @@
 #define CURL_REMOTE_FILE_NOT_FOUND 251757178
 #define CURL_SSH 251757186
 #define CURL_SSL_SHUTDOWN_FAILED 251757194
-#define CURL_CURL_LAST 251757202
+#define CURL_AGAIN 251757202
+#define CURL_CURL_LAST 251757210
  
 #pragma __member_alignment __restore

packages/vms/curlmsg.msg

@@ -8,8 +8,8 @@
 !
 ! With the exception of CURLE_OK, all of the messages are at 
 ! the error severity level.  With the exception of 
-! FTP_USER_PWD_INCORRECT, which is a shortened form of 
+! PEER_FAILED_VERIF, which is a shortened form of 
-! FTP_USER_PASSWORD_INCORRECT, these are the same names as the 
+! PEER_FAILED_VERIFICATION, these are the same names as the 
 ! CURLE_ ones in include/curl.h.  The Message Utility manual states
 ! "The combined length of the prefix and the message symbol name cannot 
 ! exceed 31 characters."  With a prefix of five that leaves us with 26
@@ -27,76 +27,76 @@ OK		<normal successful completion>
 UNSUPPORTED_PROTOCOL	<unsupported protocol>
 FAILED_INIT		<failed init>
 URL_MALFORMAT		<URL malformat>
-URL_MALFORMAT_USER	<URL malformat user>
+OBSOLETE4		<obsolete error code>
 COULDNT_RESOLVE_PROXY	<could not resolve proxy>
 COULDNT_RESOLVE_HOST	<could not resolve host>
 COULDNT_CONNECT		<could not connect>
 FTP_WEIRD_SERVER_REPLY	<FTP weird server reply>
 FTP_ACCESS_DENIED	<FTP access denied>
-FTP_USER_PWD_INCORRECT	<FTP user password incorrect>
+OBSOLETE10		<obsolete error code>
 FTP_WEIRD_PASS_REPLY	<FTP weird PASS reply>
-FTP_WEIRD_USER_REPLY	<FTP weird USER reply>
+OBSOLETE12		<obsolete error code>
 FTP_WEIRD_PASV_REPLY	<FTP weird PASV reply>
 FTP_WEIRD_227_FORMAT	<FTP weird 227 format>
 FTP_CANT_GET_HOST	<FTP can not get host>
-FTP_CANT_RECONNECT	<FTP can not reconnect>
+OBSOLETE16		<obsolete error code>
-FTP_COULDNT_SET_BINARY	<FTP could not set binary>
+FTP_COULDNT_SET_TYPE	<FTP could not set type>
 PARTIAL_FILE		<partial file>
 FTP_COULDNT_RETR_FILE	<FTP could not RETR file>
-FTP_WRITE_ERROR		<FTP write error>
+OBSOLETE20		<obsolete error code>
-FTP_QUOTE_ERROR		<FTP quote error>
+QUOTE_ERROR		<quote command error>
 HTTP_RETURNED_ERROR	<HTTP returned error>
 WRITE_ERROR		<write error>
-MALFORMAT_USER		<user name is illegally specified>
+OBSOLETE24    		<obsolete error code>
-FTP_COULDNT_STOR_FILE	<FTP could not STOR file>
+UPLOAD_FAILED		<failed upload command>
 READ_ERROR		<read error, could not open/read file>
 OUT_OF_MEMORY		<out of memory>
 OPERATION_TIMEOUTED	<operation timed out, timeout time was reached>
-FTP_COULDNT_SET_ASCII	<FTP could not set ASCII, TYPE A failed>
+OBSOLETE29		<obsolete error code>
 FTP_PORT_FAILED		<FTP PORT operation failed>
 FTP_COULDNT_USE_REST	<FTP REST command failed>
-FTP_COULDNT_GET_SIZE	<FTP SIZE command failed>
+OBSOLETE32		<obsolete error code>
-HTTP_RANGE_ERROR	<HTTP RANGE error>
+RANGE_ERROR		<RANGE command error>
 HTTP_POST_ERROR		<HTTP POST error>
 SSL_CONNECT_ERROR	<SSL connect error>
 BAD_DOWNLOAD_RESUME	<bad download resume>
 FILE_COULDNT_READ_FILE	<FILE could not read file>
 LDAP_CANNOT_BIND	<LDAP cannot bind>
 LDAP_SEARCH_FAILED	<LDAP search failed>
-LIBRARY_NOT_FOUND	<library not found>
+OBSOLETE40		<obsolete error code>
 FUNCTION_NOT_FOUND	<function not found>
 ABORTED_BY_CALLBACK	<aborted by callback>
 BAD_FUNCTION_ARGUMENT	<bad function argument>
-BAD_CALLING_ORDER	<bad calling order>
+OBSOLETE44		<obsolete error code>
 INTERFACE_FAILED	<CURLOPT_INTERFACE failed>
-BAD_PASSWORD_ENTERED	<bad password entered, my_getpass() returns fail>
+OBSOLETE46		<obsolete error code>
 TOO_MANY_REDIRECTS	<too many redirects>
 UNKNOWN_TELNET_OPTION	<unknown TELNET option>
 TELNET_OPTION_SYNTAX	<malformed TELNET option syntax>
-OBSOLETE		<obsolete, removed after 7.7.3>
+OBSOLETE50		<obsolete error code>
-SSL_PEER_CERTIFICATE	<SSL peer certificate was not OK>
+PEER_FAILED_VERIF	<peer certificate or fingerprint failed>
 GOT_NOTHING		<got nothing>
 SSL_ENGINE_NOTFOUND	<SSL crypto engine not found>
 SSL_ENGINE_SETFAILED	<SSL can not set SSL crypto engine as default>
 SEND_ERROR		<SEND error, failure sending network data>
 RECV_ERROR		<RECV error, failure receiving network data>
-SHARE_IN_USE		<share is in use>
+OBSOLETE57  		<obsolete error code>
 SSL_CERTPROBLEM		<SSL problem with the local certificate>
 SSL_CIPHER              <SSL CIPHER, could not use specified cipher>
 SSL_CACERT		<SSL CACERT, problem with the CA cert (path?)>
 BAD_CONTENT_ENCODING	<unrecognized transfer encoding>
 LDAP_INVALID_URL	<LDAP invalid url>
 FILESIZE_EXCEEDED	<maximum file size exceeded>
-FTP_SSL_FAILED		<requested FTP SSL level failed>
+USE_SSL_FAILED		<requested FTP SSL level failed>
 SEND_FAIL_REWIND	<sending data requires a rewind that failed>
 SSL_ENGINE_INITFAILED	<failed to initialise ENGINE>
 LOGIN_DENIED		<user or password not accepted. failed to login>
 TFTP_NOTFOUND		<file not found on server>
 TFTP_PERM		<permission problem on server>
-TFTP_DISKFULL		<out of disk space on server>
+REMOTE_DISK_FULL	<out of disk space on server>
 TFTP_ILLEGAL		<illegal TFTP operation>
 TFTP_UNKNOWNID		<unknown transfer ID>
-TFTP_EXISTS		<file already exists>
+REMOTE_FILE_EXISTS	<file already exists>
 TFTP_NOSUCHUSER		<no such user>
 CONV_FAILED		<conversion failed>
 CONV_REQD		<caller must register conversion callbacks>
@@ -104,6 +104,7 @@ SSL_CACERT_BADFILE	<could not load CACERT file>
 REMOTE_FILE_NOT_FOUND	<remote file not found>
 SSH			<unspecified error from the SSH layer>
 SSL_SHUTDOWN_FAILED	<failed to shut down the SSL connection>
+AGAIN			<socket not ready, wait and try again>
 CURL_LAST		<CURLMSG.MSG is out of sync with the source code>
 
 .END

packages/vms/curlmsg.sdl

@@ -3,9 +3,9 @@
  MODULE $CURDEF;
  
 /*
-/* This SDL File Generated by VAX-11 Message V04-00 on 26-JUN-2007 15:35:25.21
+/* This SDL File Generated by VAX-11 Message V04-00 on 30-MAY-2008 14:09:41.93
 /*
-/* $ID: CURLMSG.MSG,V 1.5 2007-01-31 09:37:39 BAGDER EXP $
+/* $ID: CURLMSG.MSG,V 1.6 2007-07-11 23:18:15 CURLVMS EXP $
 /* 
 /* THESE VMS ERROR CODES ARE GENERATED BY TAKING APART THE CURL.H 
 /* FILE AND PUTTING ALL THE CURLE_* ENUM STUFF INTO THIS FILE, 
@@ -15,8 +15,8 @@
 /*
 /* WITH THE EXCEPTION OF CURLE_OK, ALL OF THE MESSAGES ARE AT 
 /* THE ERROR SEVERITY LEVEL.  WITH THE EXCEPTION OF 
-/* FTP_USER_PWD_INCORRECT, WHICH IS A SHORTENED FORM OF 
+/* PEER_FAILED_VERIF, WHICH IS A SHORTENED FORM OF 
-/* FTP_USER_PASSWORD_INCORRECT, THESE ARE THE SAME NAMES AS THE 
+/* PEER_FAILED_VERIFICATION, THESE ARE THE SAME NAMES AS THE 
 /* CURLE_ ONES IN INCLUDE/CURL.H.  THE MESSAGE UTILITY MANUAL STATES
 /* "THE COMBINED LENGTH OF THE PREFIX AND THE MESSAGE SYMBOL NAME CANNOT 
 /* EXCEED 31 CHARACTERS."  WITH A PREFIX OF FIVE THAT LEAVES US WITH 26
@@ -30,76 +30,76 @@
        ,"UNSUPPORTED_PROTOCOL" EQUALS %X0F018012 PREFIX "CURL" TAG ""
        ,"FAILED_INIT"  EQUALS %X0F01801A     PREFIX "CURL" TAG ""
        ,"URL_MALFORMAT" EQUALS %X0F018022    PREFIX "CURL" TAG ""
-       ,"URL_MALFORMAT_USER" EQUALS %X0F01802A PREFIX "CURL" TAG ""
+       ,"OBSOLETE4"    EQUALS %X0F01802A     PREFIX "CURL" TAG ""
        ,"COULDNT_RESOLVE_PROXY" EQUALS %X0F018032 PREFIX "CURL" TAG ""
        ,"COULDNT_RESOLVE_HOST" EQUALS %X0F01803A PREFIX "CURL" TAG ""
        ,"COULDNT_CONNECT" EQUALS %X0F018042  PREFIX "CURL" TAG ""
        ,"FTP_WEIRD_SERVER_REPLY" EQUALS %X0F01804A PREFIX "CURL" TAG ""
        ,"FTP_ACCESS_DENIED" EQUALS %X0F018052 PREFIX "CURL" TAG ""
-       ,"FTP_USER_PWD_INCORRECT" EQUALS %X0F01805A PREFIX "CURL" TAG ""
+       ,"OBSOLETE10"   EQUALS %X0F01805A     PREFIX "CURL" TAG ""
        ,"FTP_WEIRD_PASS_REPLY" EQUALS %X0F018062 PREFIX "CURL" TAG ""
-       ,"FTP_WEIRD_USER_REPLY" EQUALS %X0F01806A PREFIX "CURL" TAG ""
+       ,"OBSOLETE12"   EQUALS %X0F01806A     PREFIX "CURL" TAG ""
        ,"FTP_WEIRD_PASV_REPLY" EQUALS %X0F018072 PREFIX "CURL" TAG ""
        ,"FTP_WEIRD_227_FORMAT" EQUALS %X0F01807A PREFIX "CURL" TAG ""
        ,"FTP_CANT_GET_HOST" EQUALS %X0F018082 PREFIX "CURL" TAG ""
-       ,"FTP_CANT_RECONNECT" EQUALS %X0F01808A PREFIX "CURL" TAG ""
+       ,"OBSOLETE16"   EQUALS %X0F01808A     PREFIX "CURL" TAG ""
-       ,"FTP_COULDNT_SET_BINARY" EQUALS %X0F018092 PREFIX "CURL" TAG ""
+       ,"FTP_COULDNT_SET_TYPE" EQUALS %X0F018092 PREFIX "CURL" TAG ""
        ,"PARTIAL_FILE" EQUALS %X0F01809A     PREFIX "CURL" TAG ""
        ,"FTP_COULDNT_RETR_FILE" EQUALS %X0F0180A2 PREFIX "CURL" TAG ""
-       ,"FTP_WRITE_ERROR" EQUALS %X0F0180AA  PREFIX "CURL" TAG ""
+       ,"OBSOLETE20"   EQUALS %X0F0180AA     PREFIX "CURL" TAG ""
-       ,"FTP_QUOTE_ERROR" EQUALS %X0F0180B2  PREFIX "CURL" TAG ""
+       ,"QUOTE_ERROR"  EQUALS %X0F0180B2     PREFIX "CURL" TAG ""
        ,"HTTP_RETURNED_ERROR" EQUALS %X0F0180BA PREFIX "CURL" TAG ""
        ,"WRITE_ERROR"  EQUALS %X0F0180C2     PREFIX "CURL" TAG ""
-       ,"MALFORMAT_USER" EQUALS %X0F0180CA   PREFIX "CURL" TAG ""
+       ,"OBSOLETE24"   EQUALS %X0F0180CA     PREFIX "CURL" TAG ""
-       ,"FTP_COULDNT_STOR_FILE" EQUALS %X0F0180D2 PREFIX "CURL" TAG ""
+       ,"UPLOAD_FAILED" EQUALS %X0F0180D2    PREFIX "CURL" TAG ""
        ,"READ_ERROR"   EQUALS %X0F0180DA     PREFIX "CURL" TAG ""
        ,"OUT_OF_MEMORY" EQUALS %X0F0180E2    PREFIX "CURL" TAG ""
        ,"OPERATION_TIMEOUTED" EQUALS %X0F0180EA PREFIX "CURL" TAG ""
-       ,"FTP_COULDNT_SET_ASCII" EQUALS %X0F0180F2 PREFIX "CURL" TAG ""
+       ,"OBSOLETE29"   EQUALS %X0F0180F2     PREFIX "CURL" TAG ""
        ,"FTP_PORT_FAILED" EQUALS %X0F0180FA  PREFIX "CURL" TAG ""
        ,"FTP_COULDNT_USE_REST" EQUALS %X0F018102 PREFIX "CURL" TAG ""
-       ,"FTP_COULDNT_GET_SIZE" EQUALS %X0F01810A PREFIX "CURL" TAG ""
+       ,"OBSOLETE32"   EQUALS %X0F01810A     PREFIX "CURL" TAG ""
-       ,"HTTP_RANGE_ERROR" EQUALS %X0F018112 PREFIX "CURL" TAG ""
+       ,"RANGE_ERROR"  EQUALS %X0F018112     PREFIX "CURL" TAG ""
        ,"HTTP_POST_ERROR" EQUALS %X0F01811A  PREFIX "CURL" TAG ""
        ,"SSL_CONNECT_ERROR" EQUALS %X0F018122 PREFIX "CURL" TAG ""
        ,"BAD_DOWNLOAD_RESUME" EQUALS %X0F01812A PREFIX "CURL" TAG ""
        ,"FILE_COULDNT_READ_FILE" EQUALS %X0F018132 PREFIX "CURL" TAG ""
        ,"LDAP_CANNOT_BIND" EQUALS %X0F01813A PREFIX "CURL" TAG ""
        ,"LDAP_SEARCH_FAILED" EQUALS %X0F018142 PREFIX "CURL" TAG ""
-       ,"LIBRARY_NOT_FOUND" EQUALS %X0F01814A PREFIX "CURL" TAG ""
+       ,"OBSOLETE40"   EQUALS %X0F01814A     PREFIX "CURL" TAG ""
        ,"FUNCTION_NOT_FOUND" EQUALS %X0F018152 PREFIX "CURL" TAG ""
        ,"ABORTED_BY_CALLBACK" EQUALS %X0F01815A PREFIX "CURL" TAG ""
        ,"BAD_FUNCTION_ARGUMENT" EQUALS %X0F018162 PREFIX "CURL" TAG ""
-       ,"BAD_CALLING_ORDER" EQUALS %X0F01816A PREFIX "CURL" TAG ""
+       ,"OBSOLETE44"   EQUALS %X0F01816A     PREFIX "CURL" TAG ""
        ,"INTERFACE_FAILED" EQUALS %X0F018172 PREFIX "CURL" TAG ""
-       ,"BAD_PASSWORD_ENTERED" EQUALS %X0F01817A PREFIX "CURL" TAG ""
+       ,"OBSOLETE46"   EQUALS %X0F01817A     PREFIX "CURL" TAG ""
        ,"TOO_MANY_REDIRECTS" EQUALS %X0F018182 PREFIX "CURL" TAG ""
        ,"UNKNOWN_TELNET_OPTION" EQUALS %X0F01818A PREFIX "CURL" TAG ""
        ,"TELNET_OPTION_SYNTAX" EQUALS %X0F018192 PREFIX "CURL" TAG ""
-       ,"OBSOLETE"     EQUALS %X0F01819A     PREFIX "CURL" TAG ""
+       ,"OBSOLETE50"   EQUALS %X0F01819A     PREFIX "CURL" TAG ""
-       ,"SSL_PEER_CERTIFICATE" EQUALS %X0F0181A2 PREFIX "CURL" TAG ""
+       ,"PEER_FAILED_VERIF" EQUALS %X0F0181A2 PREFIX "CURL" TAG ""
        ,"GOT_NOTHING"  EQUALS %X0F0181AA     PREFIX "CURL" TAG ""
        ,"SSL_ENGINE_NOTFOUND" EQUALS %X0F0181B2 PREFIX "CURL" TAG ""
        ,"SSL_ENGINE_SETFAILED" EQUALS %X0F0181BA PREFIX "CURL" TAG ""
        ,"SEND_ERROR"   EQUALS %X0F0181C2     PREFIX "CURL" TAG ""
        ,"RECV_ERROR"   EQUALS %X0F0181CA     PREFIX "CURL" TAG ""
-       ,"SHARE_IN_USE" EQUALS %X0F0181D2     PREFIX "CURL" TAG ""
+       ,"OBSOLETE57"   EQUALS %X0F0181D2     PREFIX "CURL" TAG ""
        ,"SSL_CERTPROBLEM" EQUALS %X0F0181DA  PREFIX "CURL" TAG ""
        ,"SSL_CIPHER"   EQUALS %X0F0181E2     PREFIX "CURL" TAG ""
        ,"SSL_CACERT"   EQUALS %X0F0181EA     PREFIX "CURL" TAG ""
        ,"BAD_CONTENT_ENCODING" EQUALS %X0F0181F2 PREFIX "CURL" TAG ""
        ,"LDAP_INVALID_URL" EQUALS %X0F0181FA PREFIX "CURL" TAG ""
        ,"FILESIZE_EXCEEDED" EQUALS %X0F018202 PREFIX "CURL" TAG ""
-       ,"FTP_SSL_FAILED" EQUALS %X0F01820A   PREFIX "CURL" TAG ""
+       ,"USE_SSL_FAILED" EQUALS %X0F01820A   PREFIX "CURL" TAG ""
        ,"SEND_FAIL_REWIND" EQUALS %X0F018212 PREFIX "CURL" TAG ""
        ,"SSL_ENGINE_INITFAILED" EQUALS %X0F01821A PREFIX "CURL" TAG ""
        ,"LOGIN_DENIED" EQUALS %X0F018222     PREFIX "CURL" TAG ""
        ,"TFTP_NOTFOUND" EQUALS %X0F01822A    PREFIX "CURL" TAG ""
        ,"TFTP_PERM"    EQUALS %X0F018232     PREFIX "CURL" TAG ""
-       ,"TFTP_DISKFULL" EQUALS %X0F01823A    PREFIX "CURL" TAG ""
+       ,"REMOTE_DISK_FULL" EQUALS %X0F01823A PREFIX "CURL" TAG ""
        ,"TFTP_ILLEGAL" EQUALS %X0F018242     PREFIX "CURL" TAG ""
        ,"TFTP_UNKNOWNID" EQUALS %X0F01824A   PREFIX "CURL" TAG ""
-       ,"TFTP_EXISTS"  EQUALS %X0F018252     PREFIX "CURL" TAG ""
+       ,"REMOTE_FILE_EXISTS" EQUALS %X0F018252 PREFIX "CURL" TAG ""
        ,"TFTP_NOSUCHUSER" EQUALS %X0F01825A  PREFIX "CURL" TAG ""
        ,"CONV_FAILED"  EQUALS %X0F018262     PREFIX "CURL" TAG ""
        ,"CONV_REQD"    EQUALS %X0F01826A     PREFIX "CURL" TAG ""
@@ -107,6 +107,7 @@
        ,"REMOTE_FILE_NOT_FOUND" EQUALS %X0F01827A PREFIX "CURL" TAG ""
        ,"SSH"          EQUALS %X0F018282     PREFIX "CURL" TAG ""
        ,"SSL_SHUTDOWN_FAILED" EQUALS %X0F01828A PREFIX "CURL" TAG ""
-       ,"CURL_LAST"    EQUALS %X0F018292     PREFIX "CURL" TAG ""
+       ,"AGAIN"        EQUALS %X0F018292     PREFIX "CURL" TAG ""
+       ,"CURL_LAST"    EQUALS %X0F01829A     PREFIX "CURL" TAG ""
        ;
  END_MODULE;

packages/vms/curlmsg_vms.h

@@ -26,85 +26,86 @@ int       vms_show = 0;
 long vms_cond[] = 
         {
         CURL_OK,
-        CURL_UNSUPPORTED_PROTOCOL,
+	CURL_UNSUPPORTED_PROTOCOL,
-        CURL_FAILED_INIT,
+	CURL_FAILED_INIT,
-        CURL_URL_MALFORMAT,
+	CURL_URL_MALFORMAT,
-        CURL_URL_MALFORMAT_USER,
+	CURL_OBSOLETE4,
-        CURL_COULDNT_RESOLVE_PROXY,
+	CURL_COULDNT_RESOLVE_PROXY,
-        CURL_COULDNT_RESOLVE_HOST,
+	CURL_COULDNT_RESOLVE_HOST,
-        CURL_COULDNT_CONNECT,
+	CURL_COULDNT_CONNECT,
-        CURL_FTP_WEIRD_SERVER_REPLY,
+	CURL_FTP_WEIRD_SERVER_REPLY,
-        CURL_FTP_ACCESS_DENIED,
+	CURL_FTP_ACCESS_DENIED,
-        CURL_FTP_USER_PWD_INCORRECT,
+	CURL_OBSOLETE10,
-        CURL_FTP_WEIRD_PASS_REPLY,
+	CURL_FTP_WEIRD_PASS_REPLY,
-        CURL_FTP_WEIRD_USER_REPLY,
+	CURL_OBSOLETE12,
-        CURL_FTP_WEIRD_PASV_REPLY,
+	CURL_FTP_WEIRD_PASV_REPLY,
-        CURL_FTP_WEIRD_227_FORMAT,
+	CURL_FTP_WEIRD_227_FORMAT,
-        CURL_FTP_CANT_GET_HOST,
+	CURL_FTP_CANT_GET_HOST,
-        CURL_FTP_CANT_RECONNECT,
+	CURL_OBSOLETE16,
-        CURL_FTP_COULDNT_SET_BINARY,
+	CURL_FTP_COULDNT_SET_TYPE,
-        CURL_PARTIAL_FILE,
+	CURL_PARTIAL_FILE,
-        CURL_FTP_COULDNT_RETR_FILE,
+	CURL_FTP_COULDNT_RETR_FILE,
-        CURL_FTP_WRITE_ERROR,
+	CURL_OBSOLETE20,
-        CURL_FTP_QUOTE_ERROR,
+	CURL_QUOTE_ERROR,
-        CURL_HTTP_RETURNED_ERROR,
+	CURL_HTTP_RETURNED_ERROR,
-        CURL_WRITE_ERROR,
+	CURL_WRITE_ERROR,
-        CURL_MALFORMAT_USER,
+	CURL_OBSOLETE24,
-        CURL_FTP_COULDNT_STOR_FILE,
+	CURL_UPLOAD_FAILED,
-        CURL_READ_ERROR,
+	CURL_READ_ERROR,
-        CURL_OUT_OF_MEMORY,
+	CURL_OUT_OF_MEMORY,
-        CURL_OPERATION_TIMEOUTED,
+	CURL_OPERATION_TIMEOUTED,
-        CURL_FTP_COULDNT_SET_ASCII,
+	CURL_OBSOLETE29,
-        CURL_FTP_PORT_FAILED,
+	CURL_FTP_PORT_FAILED,
-        CURL_FTP_COULDNT_USE_REST,
+	CURL_FTP_COULDNT_USE_REST,
-        CURL_FTP_COULDNT_GET_SIZE,
+	CURL_OBSOLETE32,
-        CURL_HTTP_RANGE_ERROR,
+	CURL_RANGE_ERROR,
-        CURL_HTTP_POST_ERROR,
+	CURL_HTTP_POST_ERROR,
-        CURL_SSL_CONNECT_ERROR,
+	CURL_SSL_CONNECT_ERROR,
-        CURL_BAD_DOWNLOAD_RESUME,
+	CURL_BAD_DOWNLOAD_RESUME,
-        CURL_FILE_COULDNT_READ_FILE,
+	CURL_FILE_COULDNT_READ_FILE,
-        CURL_LDAP_CANNOT_BIND,
+	CURL_LDAP_CANNOT_BIND,
-        CURL_LDAP_SEARCH_FAILED,
+	CURL_LDAP_SEARCH_FAILED,
-        CURL_LIBRARY_NOT_FOUND,
+	CURL_OBSOLETE40,
-        CURL_FUNCTION_NOT_FOUND,
+	CURL_FUNCTION_NOT_FOUND,
-        CURL_ABORTED_BY_CALLBACK,
+	CURL_ABORTED_BY_CALLBACK,
-        CURL_BAD_FUNCTION_ARGUMENT,
+	CURL_BAD_FUNCTION_ARGUMENT,
-        CURL_BAD_CALLING_ORDER,
+	CURL_OBSOLETE44,
-        CURL_INTERFACE_FAILED,
+	CURL_INTERFACE_FAILED,
-        CURL_BAD_PASSWORD_ENTERED,
+	CURL_OBSOLETE46,
-        CURL_TOO_MANY_REDIRECTS,
+	CURL_TOO_MANY_REDIRECTS,
-        CURL_UNKNOWN_TELNET_OPTION,
+	CURL_UNKNOWN_TELNET_OPTION,
-        CURL_TELNET_OPTION_SYNTAX,
+	CURL_TELNET_OPTION_SYNTAX,
-        CURL_OBSOLETE,
+	CURL_OBSOLETE50,
-        CURL_SSL_PEER_CERTIFICATE,
+	CURL_PEER_FAILED_VERIF,
-        CURL_GOT_NOTHING,
+	CURL_GOT_NOTHING,
-        CURL_SSL_ENGINE_NOTFOUND,
+	CURL_SSL_ENGINE_NOTFOUND,
-        CURL_SSL_ENGINE_SETFAILED,
+	CURL_SSL_ENGINE_SETFAILED,
-        CURL_SEND_ERROR,
+	CURL_SEND_ERROR,
-        CURL_RECV_ERROR,
+	CURL_RECV_ERROR,
-        CURL_SHARE_IN_USE,
+	CURL_OBSOLETE57,
-        CURL_SSL_CERTPROBLEM,
+	CURL_SSL_CERTPROBLEM,
-        CURL_SSL_CIPHER,
+	CURL_SSL_CIPHER,
-        CURL_SSL_CACERT,
+	CURL_SSL_CACERT,
-        CURL_BAD_CONTENT_ENCODING,
+	CURL_BAD_CONTENT_ENCODING,
-        CURL_LDAP_INVALID_URL,
+	CURL_LDAP_INVALID_URL,
-        CURL_FILESIZE_EXCEEDED,
+	CURL_FILESIZE_EXCEEDED,
-        CURL_FTP_SSL_FAILED,
+	CURL_USE_SSL_FAILED,
-        CURL_SEND_FAIL_REWIND,
+	CURL_SEND_FAIL_REWIND,
-        CURL_SSL_ENGINE_INITFAILED,
+	CURL_SSL_ENGINE_INITFAILED,
-        CURL_LOGIN_DENIED,
+	CURL_LOGIN_DENIED,
-        CURL_TFTP_NOTFOUND,
+	CURL_TFTP_NOTFOUND,
-        CURL_TFTP_PERM,
+	CURL_TFTP_PERM,
-        CURL_TFTP_DISKFULL,
+	CURL_REMOTE_DISK_FULL,
-        CURL_TFTP_ILLEGAL,
+	CURL_TFTP_ILLEGAL,
-        CURL_TFTP_UNKNOWNID,
+	CURL_TFTP_UNKNOWNID,
-        CURL_TFTP_EXISTS,
+	CURL_REMOTE_FILE_EXISTS,
-        CURL_TFTP_NOSUCHUSER,
+	CURL_TFTP_NOSUCHUSER,
 	CURL_CONV_FAILED,
 	CURL_CONV_REQD,
 	CURL_SSL_CACERT_BADFILE,
 	CURL_REMOTE_FILE_NOT_FOUND,
 	CURL_SSH,
 	CURL_SSL_SHUTDOWN_FAILED,
+	CURL_AGAIN,
         CURL_CURL_LAST
         };

src/main.c

@@ -3915,11 +3915,14 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
 
         res = getparameter(flag, nextarg, &passarg, config);
         if(res) {
-          const char *reason = param2text(res);
+          int retval = CURLE_OK;
-          if(res != PARAM_HELP_REQUESTED)
+          if(res != PARAM_HELP_REQUESTED) {
+            const char *reason = param2text(res);
             helpf(config->errors, "option %s: %s\n", origopt, reason);
+            retval = CURLE_FAILED_INIT;
+          }
           clean_getout(config);
-          return CURLE_FAILED_INIT;
+          return retval;
         }
 
         if(passarg) /* we're supposed to skip this */

tests/data/test1013

@@ -31,7 +31,7 @@ Compare curl --version with curl-config --protocols
 # Verify data after the test has been "shot"
 <verify>
 <errorcode>
-2
+0
 </errorcode>
 </verify>
 </testcase>

tests/data/test1014

@@ -31,7 +31,7 @@ Compare curl --version with curl-config --features
 # Verify data after the test has been "shot"
 <verify>
 <errorcode>
-2
+0
 </errorcode>
 </verify>
 </testcase>

tests/data/test1022

@@ -31,7 +31,7 @@ Compare curl --version with curl-config --version
 # Verify data after the test has been "shot"
 <verify>
 <errorcode>
-2
+0
 </errorcode>
 </verify>
 </testcase>

tests/data/test1023

@@ -31,7 +31,7 @@ Compare curl --version with curl-config --vernum
 # Verify data after the test has been "shot"
 <verify>
 <errorcode>
-2
+0
 </errorcode>
 </verify>
 </testcase>

tests/data/test1026

@@ -33,7 +33,7 @@ perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(a\s*tool\s*to\s*transfer\s*data)|(m
 # Verify data after the test has been "shot"
 <verify>
 <errorcode>
-2
+0
 </errorcode>
 </verify>
 </testcase>

tests/data/test1027

@@ -33,7 +33,7 @@ perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show ver
 # Verify data after the test has been "shot"
 <verify>
 <errorcode>
-2
+0
 </errorcode>
 </verify>
 </testcase>