Commit aed0cc6f authored by James Housley's avatar James Housley
Browse files

Using fdopen() is a more correct way to implement the CURLOPT_NEW_FILE_PREMS 

file.c, but the debug interface was missing.  This adds the routines needed
to make the memory debuging work for fdopen().
parent d500c468

lib/file.c

+1 −2
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ static CURLcode file_upload(struct connectdata *conn) 
      failf(data, "Can't open %s for writing", file->path);

      return CURLE_WRITE_ERROR;

    }

    close(fd);

    fp = fopen(file->path, "wb");

    fp = fdopen(fd, "wb");

  }



  if(!fp) {

lib/memdebug.c

+10 −0
Original line number Diff line number Diff line
@@ -280,6 +280,16 @@ FILE *curl_fopen(const char *file, const char *mode, 
  return res;

}



FILE *curl_fdopen(int filedes, const char *mode,

                  int line, const char *source)

{

  FILE *res=(fdopen)(filedes, mode);

  if(logfile)

    fprintf(logfile, "FILE %s:%d fdopen(\"%d\",\"%s\") = %p\n",

            source, line, filedes, mode, res);

  return res;

}



int curl_fclose(FILE *file, int line, const char *source)

{

  int res;

lib/memdebug.h

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ CURL_EXTERN int curl_accept(int s, void *addr, void *addrlen, 
/* FILE functions */

CURL_EXTERN FILE *curl_fopen(const char *file, const char *mode, int line,

                             const char *source);

CURL_EXTERN FILE *curl_fdopen(int filedes, const char *mode, int line,

                              const char *source);

CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source);



#ifndef MEMDEBUG_NODEFINES
@@ -117,6 +119,8 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); 


#undef fopen

#define fopen(file,mode) curl_fopen(file,mode,__LINE__,__FILE__)

#undef fdopen

#define fdopen(file,mode) curl_fdopen(file,mode,__LINE__,__FILE__)

#define fclose(file) curl_fclose(file,__LINE__,__FILE__)



#endif /* MEMDEBUG_NODEFINES */

tests/memanalyze.pl

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ while(<FILE>) { 
        $linenum = $2;

        $function = $3;



        if($function =~ /fopen\(\"([^\"]*)\",\"([^\"]*)\"\) = (\(nil\)|0x([0-9a-f]*))/) {

        if($function =~ /f[d]*open\(\"([^\"]*)\",\"([^\"]*)\"\) = (\(nil\)|0x([0-9a-f]*))/) {

            if($3 eq "(nil)") {

                ;

            }