Commit eff18763 authored by Yang Tse's avatar Yang Tse
Browse files 

portability fix
parent 3e21f1e9

tests/libtest/lib568.c

+9 −8
Original line number Diff line number Diff line
@@ -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");

  if(sdpf == NULL) {

  close(sdp);



  sdpf = fopen("log/file568.txt", "rb");

  if(sdpf == NULL) {

    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++);

tests/libtest/lib569.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

tests/libtest/lib571.c

+6 −4
Original line number Diff line number Diff line
@@ -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;