[Sblim-commit] wbemcli ChangeLog, 1.39, 1.40 CimCurl.cpp, 1.16, 1.17 CimXml.cpp, 1.74, 1.75 NEWS, 1.46, 1.47 main.cpp, 1.35, 1.36

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/wbemcli
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1447

Modified Files:
	ChangeLog CimCurl.cpp CimXml.cpp NEWS main.cpp 
Log Message:
Fixed 0002665: Add -e100 option to wbemcli

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- NEWS	25 Mar 2013 04:38:45 -0000	1.46
+++ NEWS	19 Sep 2013 14:34:26 -0000	1.47
@@ -5,8 +5,9 @@
 - 3519016 wbemcli does not support EmbeddedObject attr of PARAMVALUE
 - 3514126 wbemcli does not compile with GCC 4.7
 - 3495602 Fix for ID 3202420 (CDATA escape) breaks cim clients
-- 0002626 - Add IPv6 LLA support to wbemcli
-- 0002627 - Add -w option to wbemcli
+- 0002626 Add IPv6 LLA support to wbemcli
+- 0002627 Add -w option to wbemcli
+- 0002665 Add -e100 option to wbemcli
 
 Changes in Version 1.6.2
 ========================

Index: main.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/main.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- main.cpp	25 Mar 2013 04:38:45 -0000	1.35
+++ main.cpp	19 Sep 2013 14:34:26 -0000	1.36
@@ -61,6 +61,7 @@
 extern int openwbem;
 extern int dlmRefs;
 extern int reqChunking;
+extern int expect100;
 int waitTime;
 
 
@@ -68,7 +69,7 @@
 {
    cerr<<"usage:";
    cerr<<"\twbemcli gc|gcd|dc|ec|ecn|gi|ci|mi|di|ei|ein|ain|ai|rin|ri|gp|sp|cm|cmx\n"
-         "\t        [-nl] [-dx] [-t] [-cte] [-h] [-v] [-w <waittime>]\n"
+         "\t        [-nl] [-dx] [-t] [-cte] [-h] [-v] [-w <waittime>] [-e100]\n"
          "\t        [-noverify] [-cacert <file>] [-clientcert <file>] [-clientkey <file>]\n"
          "\t        [-ac <assocClass>] [-arc <resultClass>] [-ar <role>] [-arr <resultRole>]\n"
          "\t        objectPath [prop=value,[...]] [props[,...]]\n"<<endl;
@@ -200,6 +201,7 @@
  	   else if (strcmp(*argv,"-arc")==0) resultClass=*(++argv);
  	   else if (strcmp(*argv,"-ar")==0) role=*(++argv);
  	   else if (strcmp(*argv,"-arr")==0) resultRole=*(++argv);
+           else if (strcmp(*argv,"-e100")==0) expect100 = 1;
            else if (strcmp(*argv,"-w")==0) {
              waitTime = (int) strtol(*(++argv),&endptr,0);
              if (endptr == *argv) err=1;  // no digits found

Index: CimCurl.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimCurl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CimCurl.cpp	25 Mar 2013 04:38:45 -0000	1.16
+++ CimCurl.cpp	19 Sep 2013 14:34:26 -0000	1.17
@@ -34,6 +34,7 @@
 extern int dumpXml;
 extern int reqChunking;
 extern int waitTime;
+extern int expect100;
 
 // These are the constant headers added to all requests
 static const char *headers[] = {
@@ -42,7 +43,6 @@
     "CIMProtocolVersion: 1.0",
     "CIMOperation: MethodCall",
     "Accept:",
-    "Expect:",
 };
 #define NUM_HEADERS ((sizeof(headers))/(sizeof(headers[0])))
 
@@ -223,6 +223,10 @@
     object += sb;
     mHeaders = curl_slist_append(mHeaders, object.c_str());
 
+    // Optionally send "Expect: 100-continue" header
+    if (expect100)
+      mHeaders = curl_slist_append(mHeaders, "Expect: 100-continue");
+
     // Set all of the headers for the request
     rv = curl_easy_setopt(mHandle, CURLOPT_HTTPHEADER, mHeaders);
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	25 Mar 2013 04:38:45 -0000	1.39
+++ ChangeLog	19 Sep 2013 14:34:25 -0000	1.40
@@ -1,3 +1,9 @@
+2013-09-19 Dave Heller <hel...@us...>
+
+	* CimCurl.cpp, CimXml.cpp, main.cpp, NEWS:
+
+	Fixed 0002665: Add -e100 option to wbemcli
+
 2013-03-25 Dave Heller <hel...@us...>
 
 	* CimCurl.cpp, main.cpp, NEWS:

Index: CimXml.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimXml.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- CimXml.cpp	25 Mar 2013 04:05:49 -0000	1.74
+++ CimXml.cpp	19 Sep 2013 14:34:26 -0000	1.75
@@ -61,6 +61,7 @@
 int addType=0;		/* Append array ([]) and reference (&) indicators */
 int openwbem=0;
 int reqChunking=0;
+int expect100=0;
 
 /*-------------------------------------------------------*/
 /*   XmlBuffer support                                   */