diff options
| author | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-10-05 07:37:32 +0000 |
|---|---|---|
| committer | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-10-05 07:37:32 +0000 |
| commit | a957d24412318bdd6dba162e4bc51680ad118036 (patch) | |
| tree | af1ccb4bccd9d2facd79d10c1a4110c9d747752c /rdiff-backup/rdiff_backup/cmodule.c | |
| parent | 23864c166d3cd702158733118f5e388c97cbf5d7 (diff) | |
| download | rdiff-backup-a957d24412318bdd6dba162e4bc51680ad118036.tar.gz | |
Added David S.'s major/minor patch in cmodule.c,
SetConnections.py now normalizes rpaths,
log.py now returns LoggerError if can't open logfile,
Main.py catches logger error if can't open restore log
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@216 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/cmodule.c')
| -rw-r--r-- | rdiff-backup/rdiff_backup/cmodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/cmodule.c b/rdiff-backup/rdiff_backup/cmodule.c index c54166d..b9e3e3e 100644 --- a/rdiff-backup/rdiff_backup/cmodule.c +++ b/rdiff-backup/rdiff_backup/cmodule.c @@ -129,12 +129,12 @@ static PyObject *c_make_file_dict(self, args) char devtype[2]; #if defined(HAVE_LONG_LONG) && !defined(MS_WINDOWS) LONG_LONG devnums = (LONG_LONG)sbuf.st_rdev; - PyObject *major_num = PyLong_FromLongLong(devnums >> 8); + PyObject *major_num = PyLong_FromLongLong(major(devnums)); #else long int devnums = (long)sbuf.st_dev; PyObject *major_num = PyInt_FromLong(devnums >> 8); #endif - int minor_num = (int)(devnums & 0xff); + int minor_num = (int)(minor(devnums)); if S_ISCHR(mode) strcpy(devtype, "c"); else strcpy(devtype, "b"); return_val = Py_BuildValue("{s:s,s:O,s:l,s:l,s:l,s:O,s:O,s:l,s:N}", |