Checkinstall patch: Difference between revisions
From MDWiki
Jump to navigationJump to search
No edit summary |
No edit summary |
||
| Line 2: | Line 2: | ||
!installwatch.patch | !installwatch.patch | ||
|- | |- | ||
|--- installwatch.c.svn-base 2007-04-07 14:27:23.000000000 -0400 | | --- installwatch.c.svn-base 2007-04-07 14:27:23.000000000 -0400 | ||
|+++ installwatch.c 2007-04-07 14:25:06.000000000 -0400 | | +++ installwatch.c 2007-04-07 14:25:06.000000000 -0400 | ||
|@@ -84,7 +84,7 @@ | | @@ -84,7 +84,7 @@ | ||
| static int (*true_open)(const char *, int, ...); | | static int (*true_open)(const char *, int, ...); | ||
| static DIR *(*true_opendir)(const char *); | | static DIR *(*true_opendir)(const char *); | ||
| static struct dirent *(*true_readdir)(DIR *dir); | | static struct dirent *(*true_readdir)(DIR *dir); | ||
|-static int (*true_readlink)(const char*,char *,size_t); | | -static int (*true_readlink)(const char*,char *,size_t); | ||
|+static ssize_t (*true_readlink)(const char*,char *,size_t); | | +static ssize_t (*true_readlink)(const char*,char *,size_t); | ||
| static char *(*true_realpath)(const char *,char *); | | static char *(*true_realpath)(const char *,char *); | ||
| static int (*true_rename)(const char *, const char *); | | static int (*true_rename)(const char *, const char *); | ||
| static int (*true_rmdir)(const char *); | | static int (*true_rmdir)(const char *); | ||
|@@ -546,7 +546,7 @@ | | @@ -546,7 +546,7 @@ | ||
| | | struct utimbuf timbuf; | ||
| | | size_t truesz; | ||
| | | char linkpath[PATH_MAX+1]; | ||
|- size_t linksz; | | - size_t linksz; | ||
|+ ssize_t linksz; | | + ssize_t linksz; | ||
| | | | ||
| #if DEBUG | | #if DEBUG | ||
| | | debug(2,"copy_path(%s,%s)\n",truepath,translroot); | ||
|@@ -1582,7 +1582,7 @@ | | @@ -1582,7 +1582,7 @@ | ||
| | | struct stat reslvinfo; | ||
| | | instw_t iw; | ||
| | | char wpath[PATH_MAX+1]; | ||
|- size_t wsz=0; | | - size_t wsz=0; | ||
|+ ssize_t wsz=0; | | + ssize_t wsz=0; | ||
| | | char linkpath[PATH_MAX+1]; | ||
| | | | ||
| | | | ||
|@@ -2698,8 +2698,8 @@ | | @@ -2698,8 +2698,8 @@ | ||
| | | return result; | ||
| } | | } | ||
| | | | ||
|-int readlink(const char *path,char *buf,size_t bufsiz) { | | -int readlink(const char *path,char *buf,size_t bufsiz) { | ||
|- int result; | | - int result; | ||
|+ssize_t readlink(const char *path,char *buf,size_t bufsiz) { | | +ssize_t readlink(const char *path,char *buf,size_t bufsiz) { | ||
|+ ssize_t result; | | + ssize_t result; | ||
| | | instw_t instw; | ||
| | | int status; | ||
|} | |} | ||
patch -p0 < installwatch_patch.c | patch -p0 < installwatch_patch.c | ||
Revision as of 09:27, 11 August 2007
| installwatch.patch | ||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| --- installwatch.c.svn-base 2007-04-07 14:27:23.000000000 -0400 | +++ installwatch.c 2007-04-07 14:25:06.000000000 -0400 | @@ -84,7 +84,7 @@ | static int (*true_open)(const char *, int, ...); | static DIR *(*true_opendir)(const char *); | static struct dirent *(*true_readdir)(DIR *dir); | -static int (*true_readlink)(const char*,char *,size_t); | +static ssize_t (*true_readlink)(const char*,char *,size_t); | static char *(*true_realpath)(const char *,char *); | static int (*true_rename)(const char *, const char *); | static int (*true_rmdir)(const char *); | @@ -546,7 +546,7 @@ | struct utimbuf timbuf; | size_t truesz; | char linkpath[PATH_MAX+1]; | - size_t linksz; | + ssize_t linksz; | #if DEBUG | debug(2,"copy_path(%s,%s)\n",truepath,translroot); | @@ -1582,7 +1582,7 @@ | struct stat reslvinfo; | instw_t iw; | char wpath[PATH_MAX+1]; | - size_t wsz=0; | + ssize_t wsz=0; | char linkpath[PATH_MAX+1]; | @@ -2698,8 +2698,8 @@ | return result; | } | -int readlink(const char *path,char *buf,size_t bufsiz) { | - int result; | +ssize_t readlink(const char *path,char *buf,size_t bufsiz) { | + ssize_t result; | instw_t instw; | int status; |
patch -p0 < installwatch_patch.c
