mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
Renamed MSDOS_FILESYSTEM to avoid conflict with MIT GSS
This commit is contained in:
parent
100945694a
commit
791ad1210e
10
lib/file.c
10
lib/file.c
@ -91,7 +91,7 @@
|
|||||||
#include "memdebug.h"
|
#include "memdebug.h"
|
||||||
|
|
||||||
#if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || defined(__SYMBIAN32__)
|
#if defined(WIN32) || defined(MSDOS) || defined(__EMX__) || defined(__SYMBIAN32__)
|
||||||
#define MSDOS_FILESYSTEM 1
|
#define DOS_FILESYSTEM 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -189,7 +189,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
|
|||||||
char *real_path = curl_easy_unescape(data, data->state.path, 0, NULL);
|
char *real_path = curl_easy_unescape(data, data->state.path, 0, NULL);
|
||||||
struct FILEPROTO *file;
|
struct FILEPROTO *file;
|
||||||
int fd;
|
int fd;
|
||||||
#ifdef MSDOS_FILESYSTEM
|
#ifdef DOS_FILESYSTEM
|
||||||
int i;
|
int i;
|
||||||
char *actual_path;
|
char *actual_path;
|
||||||
#endif
|
#endif
|
||||||
@ -220,7 +220,7 @@ static CURLcode file_connect(struct connectdata *conn, bool *done)
|
|||||||
file->fd = -1;
|
file->fd = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MSDOS_FILESYSTEM
|
#ifdef DOS_FILESYSTEM
|
||||||
/* If the first character is a slash, and there's
|
/* If the first character is a slash, and there's
|
||||||
something that looks like a drive at the beginning of
|
something that looks like a drive at the beginning of
|
||||||
the path, skip the slash. If we remove the initial
|
the path, skip the slash. If we remove the initial
|
||||||
@ -282,7 +282,7 @@ static CURLcode file_done(struct connectdata *conn,
|
|||||||
return CURLE_OK;
|
return CURLE_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MSDOS_FILESYSTEM
|
#ifdef DOS_FILESYSTEM
|
||||||
#define DIRSEP '\\'
|
#define DIRSEP '\\'
|
||||||
#else
|
#else
|
||||||
#define DIRSEP '/'
|
#define DIRSEP '/'
|
||||||
@ -322,7 +322,7 @@ static CURLcode file_upload(struct connectdata *conn)
|
|||||||
else {
|
else {
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
#ifdef MSDOS_FILESYSTEM
|
#ifdef DOS_FILESYSTEM
|
||||||
fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,
|
fd = open(file->path, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY,
|
||||||
conn->data->set.new_file_perms);
|
conn->data->set.new_file_perms);
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user