--- a/GEMBASSY-1.0.3/include/ghttp.c	Fri Jun 26 05:20:29 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,378 +0,0 @@
-/******************************************************************************
-** @source GEMBASSY http routines
-**
-** @version 1.0
-** @modified December 27 2012 Hidetoshi Itaya Created this file
-** @@
-**
-** This library is free software; you can redistribute it and/or
-** modify it under the terms of the GNU Library General Public
-** License as published by the Free Software Foundation; either
-** version 2 of the License, or (at your option) any later version.
-**
-** This library is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** Library General Public License for more details.
-**
-** You should have received a copy of the GNU Library General Public
-** License along with this library; if not, write to the
-** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA  02111-1307, USA.
-******************************************************************************/
-
-#include "ghttp.h"
-
-
-
-
-/* @func gHttpConvertS ********************************************************
-**
-** Converts result image to specified format
-**
-** @param [r] url [AjPStr] URL to lookup
-** @param [r] outf [AjPFile*] File to write to
-** @return [AjBool]
-** @@
-******************************************************************************/
-
-AjBool gHttpConvertS(AjPStr url, AjPFile* outf, AjPStr informat, AjPStr outformat)
-{
-  AjPRegexp regexp = NULL;
-  AjPStr jobid = NULL;
-  AjPStr convert = NULL;
-
-  regexp = ajRegCompC("^.+jobid=");
-
-  if(!ajRegExec(regexp, url))
-    {
-      return ajFalse;
-    }
-
-  if(!ajRegPost(regexp, &jobid))
-    {
-      return ajFalse;
-    }
-
-  convert = ajFmtStr("http://soap.g-language.org/WS/convert.cgi?"
-                     "jobid=%S&informat=%S&outformat=%S",
-                     jobid, informat, outformat);
-
-  if(!gHttpGetBinS(convert, outf)) {
-    return ajFalse;
-  }
-
-  return ajTrue;
-}
-
-
-
-
-/* @func gHttpConvertC ********************************************************
-**
-** Converts result image to specified format
-**
-** @param [r] url [AjPStr] URL to lookup
-** @param [r] outf [AjPFile*] File to write to
-** @return [AjBool]
-** @@
-******************************************************************************/
-
-AjBool gHttpConvertC(char* url, AjPFile* outf, AjPStr informat, AjPStr outformat)
-{
-  return gHttpConvertS(ajStrNewC(url), outf, informat, outformat);
-}
-
-
-
-
-/* @func gHttpGetBinS *********************************************************
-**
-** Writes out remote binary file to AjPFile
-**
-** @param [r] url [AjPStr] URL to lookup
-** @param [r] outf [AjPFile*] File to write to
-** @return [AjBool]
-** @@
-******************************************************************************/
-
-AjBool gHttpGetBinS(AjPStr url, AjPFile* outf)
-{
-  AjPFile file = NULL;
-  AjPStr  line = NULL;
-  AjPStr  host = NULL;
-  AjPStr  path = NULL;
-  AjPStr  get  = NULL;
-  ajint   port = 80;
-  ajuint  http = 0;
-  FILE   *fp;
-
-  AjPRegexp crlf = NULL;
-
-  char buf[8];
-
-  AjOSysSocket sock;
-
-  get = ajStrNew();
-
-  ajHttpUrlDeconstruct(url, &port, &host, &path);
-
-  while(file==NULL || gHttpRedirect(file, &host, &port, &path))
-    {
-      if(ajStrGetCharFirst(path) != '/')
-	ajStrInsertK(&path, 0, '/');
-
-      ajFmtPrintS(&get, "GET http://%S:%d%S HTTP/1.1\r\n", host, port, path);
-
-      fp = ajHttpOpen(NULL, host, port, get, &sock);
-
-      file = ajFileNewFromCfile(fp);
-
-      if(!file)
-	return ajFalse;
-    }
-
-  ajStrDel(&get);
-
-  crlf = ajRegCompC("^\r?\n$");
-
-  while(ajReadline(file, &line))
-    {
-      if(ajRegExec(crlf, line))
-	break;
-    }
-
-  while(ajReadbinBinary(file, 1, 1, buf))
-    {
-      ajWritebinBinary(*outf, 1, 1, buf);
-    }
-
-  ajFileClose(outf);
-  ajFileClose(&file);
-
-  return ajTrue;
-}
-
-
-
-
-/* @func gHttpGetBinC *********************************************************
-**
-** Retrives the C file pointer from a given URL
-**
-** @param [r] url [char*] URL to lookup
-** @param [r] outf [AjPFile*] File to write to
-** @return [AjBool]
-** @@
-******************************************************************************/
-
-AjBool gHttpGetBinC(char* url, AjPFile* outf)
-{
-  if(!gHttpGetBinS(ajStrNewC(url), outf))
-    return ajFalse;
-
-  return ajTrue;
-}
-
-
-
-
-/* @func gHttpPostSS **********************************************************
-**
-** Post a file to url
-**
-** @param [r] [AjPStr] URL to POST to
-** @param [r] [AjPStr] content to send
-** @return [AjPFilebuff]
-** @@
-******************************************************************************/
-
-AjPFilebuff gHttpPostFileSS(AjPStr url, AjPStr filename)
-{
-  AjPFilebuff buff = NULL;
-  AjPFile     file = NULL;
-  AjPStr      line = NULL;
-  AjPStr      cont = NULL;
-  AjPStr      host = NULL;
-  AjPStr      path = NULL;
-  AjPStr      post = NULL;
-  AjPStr      body = NULL;
-  ajint       port = 80;
-  ajuint      http = 0;
-  FILE       *fp;
-
-  char crlf[] = "\015\021";
-
-  AjOSysSocket sock;
-  AjOSysTimeout timo;
-
-  post = ajStrNew();
-  body = ajStrNew();
-  cont = ajStrNew();
-
-  file = ajFileNewInNameS(filename);
-
-  while(ajReadline(file, &line))
-    {
-      ajStrAppendS(&cont, line);
-    }
-
-  ajHttpUrlDeconstruct(url, &port, &host, &path);
-
-  while(buff==NULL || ajHttpRedirect(buff, &host, &port, &path, &http))
-    {
-      if(ajStrGetCharFirst(path) != '/')
-	ajStrInsertK(&path, 0, '/');
-
-      ajFmtPrintS(
-        &body,
-        "--xYzZY\015\012"
-        "Content-Disposition: form-data; name=\"file\";"
-        " filename=\"%S\"\015\012"
-        "Content-Type: text/plain\015\012"
-        "%S\015\012"
-        "\015\012--xYzZY--\015\012",
-        filename, cont
-      );
-
-      ajFmtPrintS(
-        &post,
-        "POST http://%S%S\n"
-        "Content-Length: %d\n"
-        "Content-Type: multipart/form-data; boundary=xYzZY\n\n"
-        "%S",
-        host, path,
-        ajStrGetLen(body), body
-      );
-
-      ajFmtPrint("%S", post);
-
-      fp = ajHttpOpen(NULL, host, port, post, &sock);
-
-      buff = ajFilebuffNewFromCfile(fp);
-
-      if(!buff)
-	return NULL;
-    }
-
-  ajStrDel(&post);
-
-  timo.seconds = 180;
-  ajSysTimeoutSet(&timo);
-  ajFilebuffLoadAll(buff);
-  ajSysTimeoutUnset(&timo);
-
-  return buff;
-}
-
-
-
-
-/* @func gHttpPostCS **********************************************************
-**
-** Retrives the C file pointer from a given URL
-**
-** @param [r] [char*] URL to lookup
-** @return [FILE*]
-** @@
-******************************************************************************/
-
-AjPFilebuff gHttpPostFileCS(char* url, AjPStr filename)
-{
-  AjPFilebuff buff = NULL;
-
-  buff = gHttpPostFileSS(ajStrNewC(url), filename);
-
-  if(!buff)
-    return NULL;
-
-  return buff;
-}
-
-
-
-
-/* @func gHttpRedirect ********************************************************
-**
-** Reads the header of http response in given buffer buff,
-** if it includes a redirection response updates the host, port and get
-** parameters using the 'Location' header
-**
-** @param [u] buff [FILE*] file pointer
-** @param [w] host [AjPStr*] Host name
-** @param [w] port [ajint*] Port
-** @param [w] path [AjPStr*] part of URL after port number
-** @return [AjBool] returns true if the header includes a redirection response
-** @@
-******************************************************************************/
-
-AjBool gHttpRedirect(AjPFile file, AjPStr* host, ajint* port, AjPStr* path)
-{
-  AjPFilebuff buff = NULL;
-
-  AjPRegexp httpexp  = NULL;
-  AjPRegexp nullexp  = NULL;
-  AjPRegexp redirexp = NULL;
-
-  AjPStr codestr  = NULL;
-  AjPStr newurl   = NULL;
-  AjPStr newhost  = NULL;
-  AjPStr currline = NULL;
-
-  ajuint httpcode = 0;
-
-  AjBool isheader = ajFalse;
-  AjBool ret = ajFalse;
-
-  httpexp  = ajRegCompC("^HTTP/\\S+\\s+(\\d+)");
-
-  ajReadline(file, &currline);
-
-  ajDebug("gHttpRedirect: First line: '%S'\n", currline);
-
-  if(ajRegExec(httpexp, currline))
-    {
-      isheader = ajTrue;
-      ajRegSubI(httpexp, 1, &codestr);
-      ajStrToUint(codestr, &httpcode);
-      ajDebug("Header: codestr '%S' code '%u'\n", codestr, httpcode);
-      ajStrDel(&codestr);
-    }
-
-  if(isheader)
-    {
-      if(httpcode == 301 || httpcode == 302 || httpcode==307)
-        {
-	  redirexp = ajRegCompC("^Location: (\\S+)");
-	  nullexp  = ajRegCompC("^\r?\n?$");
-
-	  while( ajReadline(file, &currline) &&
-		 !ajRegExec(nullexp, currline))
-            {
-	      ajDebug("gHttpRedirect: header line: '%S'\n", currline);
-
-	      if(ajRegExec(redirexp, currline))
-                {
-		  ajRegSubI(redirexp, 1, &newurl);
-		  ajHttpUrlDeconstruct(newurl, port, &newhost, path);
-
-		  if(ajStrGetLen(newhost))
-		    ajStrAssignS(host, newhost);
-
-		  ajStrDel(&newurl);
-		  ajStrDel(&newhost);
-		  ret = ajTrue;
-		  break;
-                }
-            }
-
-	  ajRegFree(&redirexp);
-	  ajRegFree(&nullexp);
-        }
-    }
-
-  ajRegFree(&httpexp);
-  ajStrDel(&currline);
-
-  return ret;
-}