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