]>
Commit | Line | Data |
---|---|---|
be85a188 | 1 | --- autofs-4.0.0pre7/daemon/mount.c Tue Aug 1 14:01:36 2000 |
2 | +++ autofs-4.0.0pre7/daemon/mount.c Tue Aug 1 14:01:41 2000 | |
3 | @@ -21,6 +21,7 @@ | |
4 | ||
5 | #include <syslog.h> | |
6 | #include <stdlib.h> | |
7 | +#include <string.h> | |
8 | #include "automount.h" | |
9 | ||
10 | /* These filesystems are known not to work with the "generic" module */ | |
11 | --- autofs-4.0.0pre7/modules/parse_sun.c Tue Aug 1 14:03:36 2000 | |
12 | +++ autofs-4.0.0pre7/modules/parse_sun.c Tue Aug 1 14:09:33 2000 | |
13 | @@ -16,6 +16,7 @@ | |
14 | ||
15 | #include <stdio.h> | |
16 | #include <malloc.h> | |
17 | +#include <alloca.h> | |
18 | #include <errno.h> | |
19 | #include <netdb.h> | |
20 | #include <fcntl.h> | |
21 | @@ -378,7 +379,7 @@ | |
22 | } | |
23 | } | |
24 | ||
25 | -static const char *dequote(const char *str, int strlen) | |
26 | +static char *dequote(const char *str, int strlen) | |
27 | { | |
28 | char *ret = malloc(strlen+1); | |
29 | char *cp = ret; | |
30 | @@ -415,7 +416,7 @@ | |
31 | return cp + len; | |
32 | } | |
33 | ||
34 | -static const char *concat_options(const char *left, char *right) | |
35 | +static char *concat_options(char *left, char *right) | |
36 | { | |
37 | char *ret; | |
38 | ||
39 | @@ -531,7 +532,8 @@ | |
40 | { | |
41 | struct parse_context *ctxt = (struct parse_context *) context; | |
42 | char *pmapent; | |
43 | - const char *p, *options; | |
44 | + const char *p; | |
45 | + char *options; | |
46 | int mapent_len, rv; | |
47 | int optlen; | |
48 | ||
49 | @@ -577,7 +579,7 @@ | |
50 | /* It's a multi-mount; deal with it */ | |
51 | do { | |
52 | char *myoptions = strdup(options); | |
53 | - const char *path, *loc; | |
54 | + char *path, *loc; | |
55 | int pathlen, loclen; | |
56 | ||
57 | if (myoptions == NULL) { | |
58 | @@ -641,7 +643,7 @@ | |
59 | return rv; | |
60 | } else { | |
61 | /* Normal (non-multi) entries */ | |
62 | - const char *loc; | |
63 | + char *loc; | |
64 | int loclen; | |
65 | ||
66 | if ( *p == ':' ) p++; /* Sun escape for entries starting with / */ | |
67 | --- autofs-4.0.0pre7/modules/mount_nfs.c Tue Aug 1 14:09:40 2000 | |
68 | +++ autofs-4.0.0pre7/modules/mount_nfs.c Tue Aug 1 14:10:49 2000 | |
69 | @@ -17,6 +17,7 @@ | |
70 | ||
71 | #include <stdio.h> | |
72 | #include <malloc.h> | |
73 | +#include <alloca.h> | |
74 | #include <errno.h> | |
75 | #include <netdb.h> | |
76 | #include <fcntl.h> | |
77 | @@ -201,7 +202,7 @@ | |
78 | /* Local host -- do a symlink */ | |
79 | ||
80 | /* Chomp trailing '/'s */ | |
81 | - cp = name+strlen(name); | |
82 | + cp = (char*) name+strlen(name); | |
83 | while(cp[-1] == '/') | |
84 | cp--; | |
85 | *cp = '\0'; | |
86 | --- autofs-4.0.0pre7/modules/mount_generic.c Tue Aug 1 14:11:04 2000 | |
87 | +++ autofs-4.0.0pre7/modules/mount_generic.c Tue Aug 1 14:11:13 2000 | |
88 | @@ -16,6 +16,7 @@ | |
89 | ||
90 | #include <stdio.h> | |
91 | #include <malloc.h> | |
92 | +#include <alloca.h> | |
93 | #include <errno.h> | |
94 | #include <fcntl.h> | |
95 | #include <unistd.h> | |
96 | --- autofs-4.0.0pre7/modules/mount_ext2.c Tue Aug 1 14:02:41 2000 | |
97 | +++ autofs-4.0.0pre7/modules/mount_ext2.c Tue Aug 1 14:02:56 2000 | |
98 | @@ -16,4 +16,5 @@ | |
99 | #include <stdio.h> | |
100 | #include <malloc.h> | |
101 | +#include <alloca.h> | |
102 | #include <errno.h> | |
103 | #include <fcntl.h> | |
104 | --- autofs-4.0.0pre7/Makefile.rules Tue Aug 1 14:15:37 2000 | |
105 | +++ autofs-4.0.0pre7/Makefile.rules Tue Aug 1 14:16:29 2000 | |
106 | @@ -15,13 +15,13 @@ | |
107 | # The STRIP defined here *must not* remove any dynamic-loading symbols | |
108 | ||
109 | ifdef DEBUG | |
110 | -CFLAGS = -O2 -g -DDEBUG | |
111 | -LDFLAGS = -g | |
112 | +CFLAGS = $(RPM_OPT_FLAGS) -ggdb | |
113 | +LDFLAGS = -ggdb | |
114 | STRIP = : | |
115 | else | |
116 | -CFLAGS = -O3 -fomit-frame-pointer -Wall | |
117 | -LDFLAGS = -s | |
118 | -STRIP = strip --strip-debug | |
119 | +CFLAGS = $(RPM_OPT_FLAGS) | |
120 | +LDFLAGS = | |
121 | +STRIP = : | |
122 | endif | |
123 | ||
124 | CC = gcc |