]>
Commit | Line | Data |
---|---|---|
3cee5a5c AM |
1 | diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/Makefile samba-3.0.25a/examples/libsmbclient/smbwrapper/Makefile |
2 | --- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/Makefile 2006-01-25 00:46:42.000000000 +0100 | |
3 | +++ samba-3.0.25a/examples/libsmbclient/smbwrapper/Makefile 2007-06-17 17:43:30.088457851 +0200 | |
4 | @@ -3,7 +3,7 @@ | |
5 | ||
6 | CFLAGS = -I$(SAMBA_INCL) $(EXTLIB_INCL) | |
7 | ||
8 | -LDFLAGS = -L/usr/local/samba/lib | |
9 | +LDFLAGS = -L../../../source/bin | |
10 | ||
11 | SMBINCLUDE = -I../../../source/include | |
12 | CFLAGS= -fpic -g -O0 $(DEFS) $(SMBINCLUDE) | |
13 | diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.c samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.c | |
14 | --- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.c 2006-01-25 00:46:42.000000000 +0100 | |
15 | +++ samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.c 2007-06-17 17:38:36.620376591 +0200 | |
16 | @@ -548,7 +548,7 @@ | |
17 | /***************************************************** | |
18 | a wrapper for readlink() - needed for correct errno setting | |
19 | *******************************************************/ | |
20 | -int smbw_readlink(const char *fname, char *buf, size_t bufsize) | |
21 | +ssize_t smbw_readlink(const char *fname, char *buf, size_t bufsize) | |
22 | { | |
23 | struct SMBW_stat st; | |
24 | int ret; | |
25 | diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.h samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.h | |
26 | --- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/smbw.h 2006-01-25 00:46:42.000000000 +0100 | |
27 | +++ samba-3.0.25a/examples/libsmbclient/smbwrapper/smbw.h 2007-06-17 17:38:36.620376591 +0200 | |
28 | @@ -79,7 +79,7 @@ | |
29 | int smbw_close(int fd); | |
30 | int smbw_fcntl(int fd, int cmd, long arg); | |
31 | int smbw_access(const char *name, int mode); | |
32 | -int smbw_readlink(const char *path, char *buf, size_t bufsize); | |
33 | +ssize_t smbw_readlink(const char *path, char *buf, size_t bufsize); | |
34 | int smbw_unlink(const char *fname); | |
35 | int smbw_rename(const char *oldname, const char *newname); | |
36 | int smbw_utime(const char *fname, void *buf); | |
37 | diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.c samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.c | |
38 | --- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.c 2006-01-25 00:46:42.000000000 +0100 | |
39 | +++ samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.c 2007-06-17 17:39:16.085693163 +0200 | |
165de1ea JB |
40 | @@ -62,6 +62,7 @@ |
41 | #include <dirent.h> | |
42 | #include <signal.h> | |
43 | #include <stdarg.h> | |
44 | +#include <string.h> | |
45 | #ifdef __USE_GNU | |
46 | # define SMBW_USE_GNU | |
47 | #endif | |
48 | @@ -73,6 +74,7 @@ | |
49 | #include <errno.h> | |
50 | #include "libsmbclient.h" | |
51 | #include "bsd-strlfunc.h" | |
52 | +#include "smbw.h" | |
53 | #include "wrapper.h" | |
54 | ||
55 | /* | |
3cee5a5c AM |
56 | @@ -488,7 +490,7 @@ |
57 | * function and smbw.c et al. Functions that return other than an | |
58 | * integer value, however, MUST have their return value defined. | |
59 | */ | |
60 | - off64_t smbw_lseek(); | |
61 | + /* off64_t smbw_lseek(); */ | |
62 | ||
63 | if (smbw_fd(fd)) { | |
64 | return (off_t) smbw_lseek(fd, offset, whence); | |
65 | @@ -518,7 +520,7 @@ | |
66 | * function and smbw.c et al. Functions that return other than an | |
67 | * integer value, however, MUST have their return value defined. | |
68 | */ | |
69 | - off64_t smbw_lseek(); | |
70 | + /* off64_t smbw_lseek(); */ | |
71 | ||
72 | if (smbw_fd(fd)) | |
73 | ret = smbw_lseek(fd, offset, whence); | |
74 | @@ -1109,7 +1111,7 @@ | |
3ceb7a9c JB |
75 | return (* smbw_libc.utimes)((char *) name, (struct timeval *) tvp); |
76 | } | |
77 | ||
78 | -int readlink(const char *path, char *buf, size_t bufsize) | |
79 | +ssize_t readlink(const char *path, char *buf, size_t bufsize) | |
80 | { | |
81 | check_init("readlink"); | |
82 | ||
3cee5a5c AM |
83 | diff -urN samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.h samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.h |
84 | --- samba-3.0.25a.org/examples/libsmbclient/smbwrapper/wrapper.h 2006-01-25 00:46:42.000000000 +0100 | |
85 | +++ samba-3.0.25a/examples/libsmbclient/smbwrapper/wrapper.h 2007-06-17 17:38:36.620376591 +0200 | |
86 | @@ -123,7 +123,7 @@ | |
3ceb7a9c JB |
87 | int (* unlink)(char *name); |
88 | int (* utime)(char *name, struct utimbuf *tvp); | |
89 | int (* utimes)(char *name, struct timeval *tvp); | |
90 | - int (* readlink)(char *path, char *buf, size_t bufsize); | |
91 | + ssize_t (* readlink)(char *path, char *buf, size_t bufsize); | |
92 | int (* rename)(char *oldname, char *newname); | |
93 | int (* rmdir)(char *name); | |
94 | int (* symlink)(char *topath, char *frompath); |