X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilchttp%2Fsilchttpphp.c;h=d1cb24e09d968ef098c3c388d6b2dd651eeb8aa6;hp=f70b2acd9baa0a23ffa9b480c1e80343b2ac7312;hb=08e0dddd6750b245da53e2bc3528d0b5a6d57e8b;hpb=fc7cccf46583efae6580cae99f54a360f14a47dd

diff --git a/lib/silchttp/silchttpphp.c b/lib/silchttp/silchttpphp.c
index f70b2acd..d1cb24e0 100644
--- a/lib/silchttp/silchttpphp.c
+++ b/lib/silchttp/silchttpphp.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2006 Pekka Riikonen
+  Copyright (C) 2006 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ SilcBuffer silc_http_php(char *php_data)
     return NULL;
 #else
   memset(tmp, 0, sizeof(tmp));
-  snprintf(tmp, sizeof(tmp) - 1, "/tmp/silchttpphpXXXXXX");
+  silc_snprintf(tmp, sizeof(tmp) - 1, "/tmp/silchttpphpXXXXXX");
   if (mkstemp(tmp) == -1)
     return NULL;
   name = tmp;
@@ -66,7 +66,7 @@ SilcBuffer silc_http_php_file(const char *filename)
   SILC_LOG_DEBUG(("Executing PHP"));
 
   memset(tmp, 0, sizeof(tmp));
-  snprintf(tmp, sizeof(tmp) - 1, "php -f %s", filename);
+  silc_snprintf(tmp, sizeof(tmp) - 1, "php -f %s", filename);
 
 #ifdef SILC_WIN32
   fd = _popen(tmp, "r");
@@ -81,7 +81,11 @@ SilcBuffer silc_http_php_file(const char *filename)
     len = fread(tmp, 1, sizeof(tmp), fd);
     if (len < 0) {
       silc_buffer_free(ret);
-      pclose(fd);
+#ifdef SILC_WIN32
+      _pclose(fd);
+#else
+      pclose(fd);
+#endif /* SILC_WIN32 */
       return NULL;
     }
 
@@ -89,7 +93,11 @@ SilcBuffer silc_http_php_file(const char *filename)
       if (!ret) {
 	ret = silc_buffer_alloc(0);
 	if (!ret) {
-	  pclose(fd);
+#ifdef SILC_WIN32
+      _pclose(fd);
+#else
+      pclose(fd);
+#endif /* SILC_WIN32 */
 	  return NULL;
 	}
       }