diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-04-08 13:06:55 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2008-04-08 13:06:55 +0000 |
| commit | 4caee83a25ea255def17a585109f691d1ab36ddd (patch) | |
| tree | 65947d5c25d598fd75c9acc25e0d368114ca4783 | |
| parent | aebabc52cd96db291437e34dbef12563102d23c1 (diff) | |
| download | rdiff-backup-4caee83a25ea255def17a585109f691d1ab36ddd.tar.gz | |
Get cmodule.c building natively on Windows (Patch from Josh Nisly)
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@880 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
| -rw-r--r-- | rdiff-backup/CHANGELOG | 2 | ||||
| -rw-r--r-- | rdiff-backup/rdiff_backup/cmodule.c | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index f37d28d..c96529b 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -1,6 +1,8 @@ New in v1.1.16 (????/??/??) --------------------------- +Get cmodule.c building natively on Windows. (Patch from Josh Nisly) + Don't give up right away if we can't open a file. Try chmod'ing it even if we aren't root or don't own it, since that can sometimes work on AFS and NFS. Closes Savannah bug #21202. (Andrew Ferguson) diff --git a/rdiff-backup/rdiff_backup/cmodule.c b/rdiff-backup/rdiff_backup/cmodule.c index 5fc61e0..28c5292 100644 --- a/rdiff-backup/rdiff_backup/cmodule.c +++ b/rdiff-backup/rdiff_backup/cmodule.c @@ -24,7 +24,9 @@ #include <Python.h> #include <sys/types.h> #include <sys/stat.h> +#if !defined(MS_WIN64) && !defined(MS_WIN32) #include <unistd.h> +#endif #include <errno.h> @@ -46,13 +48,17 @@ /* This code taken from Python's posixmodule.c */ #undef STAT #if defined(MS_WIN64) || defined(MS_WIN32) +# define LSTAT _stati64 # define STAT _stati64 # define FSTAT _fstati64 # define STRUCT_STAT struct _stati64 +# define SYNC _flushall #else +# define LSTAT lstat # define STAT stat # define FSTAT fstat # define STRUCT_STAT struct stat +# define SYNC sync #endif #ifndef PY_LONG_LONG #define PY_LONG_LONG LONG_LONG @@ -69,6 +75,15 @@ #define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO) #endif +#if defined(MS_WIN64) || defined(MS_WIN32) +#define S_ISSOCK(mode) (0) +#define S_ISFIFO(mode) (0) +#define S_ISLNK(mode) (0) +#define S_ISLNK(mode) (0) +#define S_ISCHR(mode) (0) +#define S_ISBLK(mode) (0) +#endif + static PyObject *UnknownFileTypeError; static PyObject *c_make_file_dict(PyObject *self, PyObject *args); static PyObject *long2str(PyObject *self, PyObject *args); @@ -90,7 +105,7 @@ static PyObject *c_make_file_dict(self, args) if (!PyArg_ParseTuple(args, "s", &filename)) return NULL; Py_BEGIN_ALLOW_THREADS - res = lstat(filename, &sbuf); + res = LSTAT(filename, &sbuf); Py_END_ALLOW_THREADS if (res != 0) { @@ -225,7 +240,7 @@ static PyObject *my_sync(self, args) PyObject *args; { if (!PyArg_ParseTuple(args, "")) return NULL; - sync(); + SYNC(); return Py_BuildValue(""); } |