2018-09-04 Fred Gleason <fredg@paravelsystems.com>

* Modified rd_listlog(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_listschedcodes(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_listservices(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_listsystemsettings(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_removecart(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_removecut(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_savelog(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_trimaudio(7) in the rivwebcapi to process UTF-8 strings correctly. * Modified rd_unassignschedcode(7) in the rivwebcapi to process UTF-8 strings correctly.
2025-10-11 00:53:53 +02:00 · 2018-09-04 17:03:56 -04:00
parent 5fbfed9d38
commit 220fef0c56
11 changed files with 888 additions and 192 deletions
--- a/19
+++ b/19
@@ -17597,3 +17597,22 @@
 	strings correctly.
 	* Modified rd_listgroups(7) in the rivwebcapi to process UTF-8
 	strings correctly.
+2018-09-04 Fred Gleason <fredg@paravelsystems.com>
+	* Modified rd_listlog(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_listschedcodes(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_listservices(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_listsystemsettings(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_removecart(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_removecut(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_savelog(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_trimaudio(7) in the rivwebcapi to process UTF-8
+	strings correctly.
+	* Modified rd_unassignschedcode(7) in the rivwebcapi to process UTF-8
+	strings correctly.
--- a/apis/rivwebcapi/rivwebcapi/rd_listlog.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_listlog.c
@@ -3,6 +3,7 @@
 * Implementation of the ListLog Rivendell Access Library
 *
 * (C) Copyright 2015 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -432,6 +433,9 @@ int RD_ListLog(struct rd_logline *logline[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char cart_buffer[7];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  /*  Set number of recs so if fail already set */
  *numrecs = 0;
@@ -466,16 +470,51 @@ int RD_ListLog(struct rd_logline *logline[],
 			__ListLogElementEnd);
  XML_SetCharacterDataHandler(parser,__ListLogElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=22&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&NAME=%s",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0),
-	curl_easy_escape(curl,real_logname,0));
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "22",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"NAME",
+        CURLFORM_COPYCONTENTS, 
+	real_logname,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__ListLogCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -509,6 +548,7 @@ int RD_ListLog(struct rd_logline *logline[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {
--- a/apis/rivwebcapi/rivwebcapi/rd_listlogs.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_listlogs.c
@@ -3,6 +3,7 @@
 * Implementation of the ListLogs Rivendell Access Library
 *
 * (C) Copyright 2015 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -164,6 +165,9 @@ int RD_ListLogs(struct rd_log *logs[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char cart_buffer[7];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  /*  Set number of recs so if fail already set */
  *numrecs = 0;
@@ -209,20 +213,85 @@ int RD_ListLogs(struct rd_log *logs[],
 			__ListLogsElementEnd);
  XML_SetCharacterDataHandler(parser,__ListLogsElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=20&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&SERVICE_NAME=%s&LOG_NAME=%s&TRACKABLE=%d&FILTER=%s&RECENT=%d",
-	   curl_easy_escape(curl,username,0),
-	   curl_easy_escape(curl,passwd,0),
-	   curl_easy_escape(curl,ticket,0),
-	   curl_easy_escape(curl,checked_service,0),
-	   curl_easy_escape(curl,checked_logname,0),
-	   checked_trackable,
-	   curl_easy_escape(curl,filter,0),
-	   checked_recent);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "20",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"SERVICE_NAME",
+        CURLFORM_COPYCONTENTS,
+        checked_service,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOG_NAME",
+        CURLFORM_COPYCONTENTS,
+        checked_logname,
+	CURLFORM_END);
+
+  snprintf(cart_buffer,7,"%d",checked_trackable);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TRACKABLE",
+        CURLFORM_COPYCONTENTS,
+        cart_buffer,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"FILTER",
+        CURLFORM_COPYCONTENTS,
+        filter,
+	CURLFORM_END);
+
+  snprintf(cart_buffer,7,"%d",checked_recent);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"RECENT",
+        CURLFORM_COPYCONTENTS,
+        cart_buffer,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__ListLogsCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -256,6 +325,7 @@ int RD_ListLogs(struct rd_log *logs[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {
--- a/apis/rivwebcapi/rivwebcapi/rd_listschedcodes.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_listschedcodes.c
@@ -99,6 +99,8 @@ int RD_ListSchedCodes(struct rd_schedcodes *scodes[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

   /* Set number of recs so if fail already set */
  *numrecs = 0;
@@ -118,15 +120,44 @@ int RD_ListSchedCodes(struct rd_schedcodes *scodes[],
 			__ListSchedCodesElementEnd);
  XML_SetCharacterDataHandler(parser,__ListSchedCodesElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=24&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0));
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "24",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__ListSchedCodesCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -153,6 +184,7 @@ int RD_ListSchedCodes(struct rd_schedcodes *scodes[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
@@ -160,6 +192,7 @@ int RD_ListSchedCodes(struct rd_schedcodes *scodes[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) { 
--- a/apis/rivwebcapi/rivwebcapi/rd_listservices.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_listservices.c
@@ -3,6 +3,7 @@
 * Implementation of the List Services Rivendell Access Library
 *
 * (C) Copyright 2015 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -101,6 +102,9 @@ int RD_ListServices(struct rd_service *services[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char cart_buffer[7];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  /*  Set number of recs so if fail already set */
  *numrecs = 0;
@@ -120,16 +124,52 @@ int RD_ListServices(struct rd_service *services[],
 			__ListServicesElementEnd);
  XML_SetCharacterDataHandler(parser,__ListServicesElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=21&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&TRACKABLE=%d",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0),
-	trackable);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "21",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  snprintf(cart_buffer,7,"%u",trackable);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TRACKABLE",
+        CURLFORM_COPYCONTENTS, 
+	cart_buffer,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__ListServicesCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -156,6 +196,7 @@ int RD_ListServices(struct rd_service *services[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
@@ -163,6 +204,7 @@ int RD_ListServices(struct rd_service *services[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {
--- a/apis/rivwebcapi/rivwebcapi/rd_listsystemsettings.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_listsystemsettings.c
@@ -3,6 +3,7 @@
 * Implementation of the List System Settings Rivendell Access Library
 *
 * (C) Copyright 2017 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -107,6 +108,8 @@ int RD_ListSystemSettings(struct rd_system_settings *system_settings[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

   /* Set number of recs so if fail already set */
  *numrecs = 0;
@@ -126,15 +129,43 @@ int RD_ListSystemSettings(struct rd_system_settings *system_settings[],
 			__ListSystemSettingsElementEnd);
  XML_SetCharacterDataHandler(parser,__ListSystemSettingsElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=33&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0));
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "33",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__ListSystemSettingsCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -161,6 +192,7 @@ int RD_ListSystemSettings(struct rd_system_settings *system_settings[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
@@ -168,6 +200,7 @@ int RD_ListSystemSettings(struct rd_system_settings *system_settings[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) { 
--- a/apis/rivwebcapi/rivwebcapi/rd_removecart.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_removecart.c
@@ -82,6 +82,9 @@ int RD_RemoveCart( const char hostname[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char cart_buffer[7];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  if((curl=curl_easy_init())==NULL) {
    curl_easy_cleanup(curl);
@@ -98,16 +101,52 @@ int RD_RemoveCart( const char hostname[],
 			__RemoveCartElementEnd);
  XML_SetCharacterDataHandler(parser,__RemoveCartElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=13&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&CART_NUMBER=%u",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0),
-	cartnumber);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "13",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  snprintf(cart_buffer,7,"%u",cartnumber);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CART_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	cart_buffer,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__RemoveCartCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -134,12 +173,14 @@ int RD_RemoveCart( const char hostname[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {  //Success
--- a/apis/rivwebcapi/rivwebcapi/rd_removecut.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_removecut.c
@@ -3,6 +3,7 @@
 * Implementation of the Remove Cut Rivendell Access Library
 *
 * (C) Copyright 2015 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -83,6 +84,9 @@ int RD_RemoveCut(       const char   hostname[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char cart_buffer[7];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  if((curl=curl_easy_init())==NULL) {
    curl_easy_cleanup(curl);
@@ -99,17 +103,61 @@ int RD_RemoveCut(       const char   hostname[],
 			__RemoveCutElementEnd);
  XML_SetCharacterDataHandler(parser,__RemoveCutElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=11&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&CART_NUMBER=%u&CUT_NUMBER=%u",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0),
-	cartnumber,
-	cutnumber);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "11",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  snprintf(cart_buffer,7,"%u",cartnumber);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CART_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	cart_buffer,
+	CURLFORM_END);
+
+  snprintf(cart_buffer,7,"%u",cutnumber);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CUT_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	cart_buffer,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__RemoveCutCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -136,12 +184,14 @@ int RD_RemoveCut(       const char   hostname[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {  //Success
--- a/apis/rivwebcapi/rivwebcapi/rd_savelog.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_savelog.c
@@ -3,6 +3,7 @@
 * Header for the Save Log Rivendell Access Library
 *
 * (C) Copyright 2017 Todd Baker  <bakert@rfa.org>
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -44,14 +45,15 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
  char url[1500];
  char str[1024];
  char dtstr[256];
-  char *post=malloc(1);
  CURL *curl=NULL;
  CURLcode res;
  char errbuf[CURL_ERROR_SIZE];
  long response_code;
  unsigned i=0;
-  post[0]=0;
  char user_agent_string[255];
+  char buffer[1024];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  if((curl=curl_easy_init())==NULL) {
    curl_easy_cleanup(curl);
@@ -61,203 +63,461 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
  //
  // Log Header
  //
-  post=AppendString(post,"COMMAND=28&");
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "28",
+        CURLFORM_END);

-  snprintf(str,1024,"LOGIN_NAME=%s&",curl_easy_escape(curl,username,0));
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 

-  snprintf(str,1024,"PASSWORD=%s&",curl_easy_escape(curl,passwd,0));
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);

-  snprintf(str,1024,"TICKET=%s&",curl_easy_escape(curl,ticket,0));
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);

-  snprintf(str,1024,"LOG_NAME=%s&",curl_easy_escape(curl,logname,0));
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"SERVICE_NAME",
+        CURLFORM_COPYCONTENTS,
+	hdrvals->loghdr_service,
+	CURLFORM_END);

-  snprintf(str,1024,"SERVICE_NAME=%s&",curl_easy_escape(curl,hdrvals->loghdr_service,0));
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"DESCRIPTION",
+        CURLFORM_COPYCONTENTS,
+        hdrvals->loghdr_description,
+	CURLFORM_END);

-  snprintf(str,1024,"DESCRIPTION=%s&",curl_easy_escape(curl,hdrvals->loghdr_description,0));
-  post=AppendString(post,str);
-
-  snprintf(str,1024,"AUTO_REFRESH=%d&",hdrvals->loghdr_autorefresh);
-  post=AppendString(post,str);
+  snprintf(buffer,1024,"%d",hdrvals->loghdr_autorefresh);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"AUTO_REFRESH",
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

  RD_Cnv_tm_to_DTString(&hdrvals->loghdr_purge_date,dtstr);
-  snprintf(str,1024,"PURGE_DATE=%s&",dtstr);
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PURGE_DATE",
+        CURLFORM_COPYCONTENTS,
+        dtstr,
+	CURLFORM_END);

  RD_Cnv_tm_to_DTString(&hdrvals->loghdr_start_date,dtstr);
-  snprintf(str,1024,"START_DATE=%s&",dtstr);
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"START_DATE",
+        CURLFORM_COPYCONTENTS,
+        dtstr,
+	CURLFORM_END);

  RD_Cnv_tm_to_DTString(&hdrvals->loghdr_end_date,dtstr);
-  snprintf(str,1024,"END_DATE=%s&",dtstr);
-  post=AppendString(post,str);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"END_DATE",
+        CURLFORM_COPYCONTENTS,
+        dtstr,
+	CURLFORM_END);

-  snprintf(str,1024,"LINE_QUANTITY=%d",linevals_quan);
-  post=AppendString(post,str);
+  snprintf(buffer,1024,"%d",linevals_quan);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LINE_QUANTITY",
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

  //
  // Log Lines
  //
  for(i=0;i<linevals_quan;i++) {
-    snprintf(str,1024,"&LINE%u_ID=%u",i,linevals[i].logline_id);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_ID",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_id);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_TYPE=%u",i,linevals[i].logline_type);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_TYPE",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_type);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_CART_NUMBER=%u",i,
-	     linevals[i].logline_cart_number);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_CART_NUMBER",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_cart_number);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_START_TIME=%u",i,linevals[i].logline_starttime);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_START_TIME",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_starttime);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_GRACE_TIME=%u",i,linevals[i].logline_gracetime);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_GRACE_TIME",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_gracetime);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_TIME_TYPE=%u",i,linevals[i].logline_time_type);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_TIME_TYPE",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_time_type);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

+    snprintf(str,1024,"LINE%u_TRANS_TYPE",i);
    switch(linevals[i].logline_transition_type) {
    case 0:
-      snprintf(str,1024,"&LINE%u_TRANS_TYPE=PLAY",i);
+      snprintf(buffer,1024,"PLAY");
      break;

    case 1:
-      snprintf(str,1024,"&LINE%u_TRANS_TYPE=SEGUE",i);
+      snprintf(buffer,1024,"SEGUE");
      break;

    case 2:
-      snprintf(str,1024,"&LINE%u_TRANS_TYPE=STOP",i);
+      snprintf(buffer,1024,"STOP");
      break;
    }
-    post=AppendString(post,str);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_START_POINT=%d",i,
-	     linevals[i].logline_start_point_log);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_START_POINT",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_start_point_log);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_END_POINT=%d",i,
-	     linevals[i].logline_end_point_log);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_END_POINT",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_end_point_log);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_SEGUE_START_POINT=%d",i,
-	     linevals[i].logline_segue_start_point_log);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_SEGUE_START_POINT",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_segue_start_point_log);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_SEGUE_END_POINT=%d",i,
-	     linevals[i].logline_segue_end_point_log);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_SEGUE_END_POINT",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_segue_end_point_log);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_FADEUP_POINT=%d",i,
-	     linevals[i].logline_fadeup_point_log);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_FADEUP_POINT",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_fadeup_point_log);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_FADEUP_GAIN=%d",i,
-	     linevals[i].logline_fadeup_gain);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_FADEUP_GAIN",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_fadeup_gain);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_FADEDOWN_POINT=%d",i,
-	     linevals[i].logline_fadedown_point_log);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_FADEDOWN_POINT",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_fadedown_point_log);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_FADEDOWN_GAIN=%d",i,
-	     linevals[i].logline_fadedown_gain);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_FADEDOWN_GAIN",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_fadedown_gain);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_DUCK_UP_GAIN=%d",i,
-	     linevals[i].logline_duckup_gain);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_DUCK_UP_GAIN",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_duckup_gain);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_DUCK_DOWN_GAIN=%d",i,
-	     linevals[i].logline_duckdown_gain);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_DUCK_DOWN_GAIN",i);
+    snprintf(buffer,1024,"%d",linevals[i].logline_duckdown_gain);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_COMMENT=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_marker_comment,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_COMMENT",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_marker_comment,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_LABEL=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_marker_label,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LABEL",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_marker_label,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_ORIGIN_USER=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_origin_user,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_ORIGIN_USER",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_origin_user,
+	CURLFORM_END);

+    snprintf(str,1024,"LINE%u_ORIGIN_DATETIME",i);
    RD_Cnv_tm_to_DTString(&linevals[i].logline_origin_datetime,dtstr);
-    snprintf(str,1024,"&LINE%u_ORIGIN_DATETIME=%s",i,dtstr);
-    post=AppendString(post,str);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+	dtstr,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_ORIGIN_USER=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_origin_user,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_EVENT_LENGTH",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_event_length);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_EVENT_LENGTH=%u",i,
-	     linevals[i].logline_event_length);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LINK_EVENT_NAME",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_link_event_name,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_LINK_EVENT_NAME=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_link_event_name,0));
-    post=AppendString(post,str);
-
-    snprintf(str,1024,"&LINE%u_LINK_LENGTH=%u",i,
-	     linevals[i].logline_link_length);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LINK_LENGTH",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_link_length);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

+    snprintf(str,1024,"LINE%u_LINK_START_TIME",i);
    RD_Cnv_tm_to_DTString(&linevals[i].logline_link_starttime,dtstr);
-    snprintf(str,1024,"&LINE%u_LINK_START_TIME=%s",i,dtstr);
-    post=AppendString(post,str);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+	dtstr,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_LINK_START_SLOP=%u",i,
-	     linevals[i].logline_link_start_slop);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LINK_START_SLOP",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_link_start_slop);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_LINK_END_SLOP=%u",i,
-	     linevals[i].logline_link_end_slop);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LINK_END_SLOP",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_link_end_slop);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_LINK_ID=%u",i,
-	     linevals[i].logline_link_id);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LINK_ID",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_link_id);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_LINK_EMBEDDED=%u",i,
-	     linevals[i].logline_link_embedded);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_LINK_EMBEDDED",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_link_embedded);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

+    snprintf(str,1024,"LINE%u_EXT_START_TIME",i);
    RD_Cnv_tm_to_DTString(&linevals[i].logline_ext_starttime,dtstr);
-    snprintf(str,1024,"&LINE%u_EXT_START_TIME=%s",i,dtstr);
-    post=AppendString(post,str);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+	dtstr,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_EXT_LENGTH=%u",i,
-	     linevals[i].logline_ext_length);
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_EXT_LENGTH",i);
+    snprintf(buffer,1024,"%u",linevals[i].logline_ext_length);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        buffer,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_EXT_CART_NAME=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_ext_cart_name,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_EXT_CART_NAME",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_ext_cart_name,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_EXT_DATA=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_ext_data,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_EXT_DATA",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_ext_data,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_EXT_EVENT_ID=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_ext_event_id,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_EXT_EVENT_ID",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_ext_event_id,
+	CURLFORM_END);

-    snprintf(str,1024,"&LINE%u_EXT_ANNC_TYPE=%s",i,
-	     curl_easy_escape(curl,linevals[i].logline_ext_annc_type,0));
-    post=AppendString(post,str);
+    snprintf(str,1024,"LINE%u_EXT_ANNC_TYPE",i);
+    curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	str,
+        CURLFORM_COPYCONTENTS,
+        linevals[i].logline_ext_annc_type,
+	CURLFORM_END);
  }
-
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);
  //  curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
@@ -284,12 +544,14 @@ int RD_SaveLog(struct save_loghdr_values *hdrvals,
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {  //Success
--- a/apis/rivwebcapi/rivwebcapi/rd_trimaudio.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_trimaudio.c
@@ -3,6 +3,7 @@
 * Implementation of the TrimAudio Rivendell Access Library
 *
 * (C) Copyright 2015 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -101,7 +102,6 @@ int RD_TrimAudio(struct rd_trimaudio *trimaudio[],
                        const char user_agent[],
                  	unsigned *numrecs)
 {
-  char post[1500];
  char url[1500];
  CURL *curl=NULL;
  XML_Parser parser;
@@ -110,6 +110,9 @@ int RD_TrimAudio(struct rd_trimaudio *trimaudio[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char buffer[1024];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  if((curl=curl_easy_init())==NULL) {
    curl_easy_cleanup(curl);
@@ -129,18 +132,71 @@ int RD_TrimAudio(struct rd_trimaudio *trimaudio[],
 			__TrimAudioElementEnd);
  XML_SetCharacterDataHandler(parser,__TrimAudioElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=17&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&CART_NUMBER=%u&CUT_NUMBER=%u&TRIM_LEVEL=%d",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0),
-	cartnumber,
-	cutnumber,
-	trimlevel);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "17",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  snprintf(buffer,1024,"%u",cartnumber);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CART_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	buffer,
+	CURLFORM_END);
+
+  snprintf(buffer,1024,"%u",cutnumber);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CUT_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	buffer,
+	CURLFORM_END);
+
+  snprintf(buffer,1024,"%u",trimlevel);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CART_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	buffer,
+	CURLFORM_END);
+
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__TrimAudioCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);

@@ -166,6 +222,7 @@ int RD_TrimAudio(struct rd_trimaudio *trimaudio[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
@@ -173,6 +230,7 @@ int RD_TrimAudio(struct rd_trimaudio *trimaudio[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) { 
--- a/apis/rivwebcapi/rivwebcapi/rd_unassignschedcode.c
+++ b/apis/rivwebcapi/rivwebcapi/rd_unassignschedcode.c
@@ -3,6 +3,7 @@
 * Implementation of the UnassignSchedulCode Rivendell Access Library
 *
 * (C) Copyright 2015 Todd Baker  <bakert@rfa.org>             
+ * (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License version 2 as
@@ -76,7 +77,6 @@ int RD_UnassignSchedCode( const char hostname[],
 			const char code[],
                        const char user_agent[])
 {
-  char post[1500];
  char url[1500];
  CURL *curl=NULL;
  XML_Parser parser;
@@ -87,6 +87,9 @@ int RD_UnassignSchedCode( const char hostname[],
  char errbuf[CURL_ERROR_SIZE];
  CURLcode res;
  char user_agent_string[255];
+  char buffer[1024];
+  struct curl_httppost *first=NULL;
+  struct curl_httppost *last=NULL;

  /*   Check Code */
  for (i = 0 ; i < strlen(code) ; i++) {
@@ -119,17 +122,60 @@ int RD_UnassignSchedCode( const char hostname[],
 			__UnAssignSchedCodeElementEnd);
  XML_SetCharacterDataHandler(parser,__UnAssignSchedCodeElementData);
  snprintf(url,1500,"http://%s/rd-bin/rdxport.cgi",hostname);
-  snprintf(post,1500,"COMMAND=26&LOGIN_NAME=%s&PASSWORD=%s&TICKET=%s&CART_NUMBER=%u&CODE=%s",
-	curl_easy_escape(curl,username,0),
-	curl_easy_escape(curl,passwd,0),
-	curl_easy_escape(curl,ticket,0),
-	cartnum,
-	curl_easy_escape(curl,code,0));
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"COMMAND",
+        CURLFORM_COPYCONTENTS,
+        "26",
+        CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"LOGIN_NAME",
+	CURLFORM_COPYCONTENTS,
+	username,
+	CURLFORM_END); 
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"PASSWORD",
+        CURLFORM_COPYCONTENTS,
+	passwd,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"TICKET",
+        CURLFORM_COPYCONTENTS,
+        ticket,
+	CURLFORM_END);
+
+  snprintf(buffer,1024,"%u",cartnum);
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CART_NUMBER",
+        CURLFORM_COPYCONTENTS, 
+	buffer,
+	CURLFORM_END);
+
+  curl_formadd(&first,
+	&last,
+	CURLFORM_PTRNAME,
+	"CODE",
+        CURLFORM_COPYCONTENTS,
+        code,
+	CURLFORM_END);
  curl_easy_setopt(curl,CURLOPT_WRITEDATA,parser);
  curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,__UnAssignSchedCodeCallback);
  curl_easy_setopt(curl,CURLOPT_URL,url);
  curl_easy_setopt(curl,CURLOPT_POST,1);
-  curl_easy_setopt(curl,CURLOPT_POSTFIELDS,post);
+  curl_easy_setopt(curl,CURLOPT_HTTPPOST,first);
  curl_easy_setopt(curl,CURLOPT_NOPROGRESS,1);
  curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errbuf);

@@ -155,6 +201,7 @@ int RD_UnassignSchedCode( const char hostname[],
        else
            fprintf(stderr, "%s\n", curl_easy_strerror(res));
    #endif
+    curl_formfree(first);
    curl_easy_cleanup(curl);
    return -1;
  }
@@ -162,6 +209,7 @@ int RD_UnassignSchedCode( const char hostname[],
 /* The response OK - so figure out if we got what we wanted.. */

  curl_easy_getinfo(curl,CURLINFO_RESPONSE_CODE,&response_code);
+  curl_formfree(first);
  curl_easy_cleanup(curl);
  
  if (response_code > 199 && response_code < 300) {