From eff18763a1fdc37a45321dfc95f7bbfcec89777f Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 28 Jan 2010 10:27:09 +0000
Subject: portability fix
---
tests/libtest/lib568.c | 17 +++++++++--------
tests/libtest/lib569.c | 2 +-
tests/libtest/lib571.c | 10 ++++++----
3 files changed, 16 insertions(+), 13 deletions(-)
(limited to 'tests/libtest')
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 5e59a9cae..c9406b0ec 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -10,10 +10,12 @@
#include "test.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#include <curl/mprintf.h>
@@ -34,7 +36,7 @@ int test(char *URL)
CURL *curl;
int sdp;
FILE *sdpf;
- struct stat file_info;
+ struct_stat file_info;
char *stream_uri;
int request=1;
struct curl_slist *custom_headers=NULL;
@@ -61,9 +63,10 @@ int test(char *URL)
sdp = open("log/file568.txt", O_RDONLY);
fstat(sdp, &file_info);
- sdpf = fdopen(sdp, "rb");
+ close(sdp);
+
+ sdpf = fopen("log/file568.txt", "rb");
if(sdpf == NULL) {
- close(sdp);
fprintf(stderr, "can't open log/file568.txt\n");
return TEST_ERR_MAJOR_BAD;
}
@@ -77,13 +80,11 @@ int test(char *URL)
res = curl_easy_perform(curl);
if(res) {
fclose(sdpf);
- close(sdp);
return res;
}
curl_easy_setopt(curl, CURLOPT_UPLOAD, 0L);
fclose(sdpf);
- close(sdp);
/* Make sure we can do a normal request now */
stream_uri = suburl(URL, request++);
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index 6f276d350..9c5d803b9 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -33,7 +33,7 @@ int test(char *URL)
int i;
FILE *idfile;
- idfile = fopen(libtest_arg2, "w");
+ idfile = fopen(libtest_arg2, "wb");
if(idfile == NULL) {
fprintf(stderr, "couldn't open the Session ID File\n");
return TEST_ERR_MAJOR_BAD;
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index f530deadc..4e9f38708 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -10,10 +10,12 @@
#include "test.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
#include <curl/mprintf.h>
@@ -67,7 +69,7 @@ int test(char *URL)
int request=1;
FILE *protofile;
- protofile = fopen(libtest_arg2, "w");
+ protofile = fopen(libtest_arg2, "wb");
if(protofile == NULL) {
fprintf(stderr, "Couldn't open the protocol dump file\n");
return TEST_ERR_MAJOR_BAD;
--
cgit v1.2.3