summaryrefslogtreecommitdiff
path: root/examples/VFS/block
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2002-08-27 09:14:21 +0000
committerSimo Sorce <idra@samba.org>2002-08-27 09:14:21 +0000
commit7251f6b9ecf6f4c797baf4cd5390cf2bf310d179 (patch)
treef3794e87acce600f4211b10b345fa0c047a541eb /examples/VFS/block
parent8f6c926a8f9c8ff7abe67efb0784e0a1f96ac636 (diff)
downloadsamba-7251f6b9ecf6f4c797baf4cd5390cf2bf310d179.tar.gz
samba-7251f6b9ecf6f4c797baf4cd5390cf2bf310d179.tar.bz2
samba-7251f6b9ecf6f4c797baf4cd5390cf2bf310d179.zip
avoid using libtool for VFS modules
change a name in block.c it was hiding a function name add a comment in configure (This used to be commit 05038f44717ff07ed7d4a3afbdd8f072a3c058cc)
Diffstat (limited to 'examples/VFS/block')
-rw-r--r--examples/VFS/block/Makefile.in34
-rw-r--r--examples/VFS/block/block.c21
2 files changed, 20 insertions, 35 deletions
diff --git a/examples/VFS/block/Makefile.in b/examples/VFS/block/Makefile.in
index 3126dfa3b8..3deb17c596 100644
--- a/examples/VFS/block/Makefile.in
+++ b/examples/VFS/block/Makefile.in
@@ -1,42 +1,28 @@
-MAKEFILE = Makefile.vfs
-
-include $(MAKEFILE)
-
CC = @CC@
-LIBTOOL = libtool
-CFLAGS = @CFLAGS@ $(VFS_CFLAGS)
-CPPFLAGS = @CPPFLAGS@ $(VFS_CPPFLAGS)
-LDFLAGS = @LDFLAGS@ $(VFS_LDFLAGS)
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
LDSHFLAGS = -shared
srcdir = @builddir@
FLAGS = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -I. $(CPPFLAGS) -I$(srcdir)
+VFS_OBJS = block.so
+
# Default target
default: $(VFS_OBJS)
-# if file doesn't exist try to create one;
-# it is possible that some variables will be
-# defined correctly
-Makefile.vfs:
- @echo -ne "VFS_OBJS\t= " > $(MAKEFILE); \
- for i in *.c; do \
- echo -n $$i" " | sed -e 's/\(.*\)\.c\(.*\)/\1\.so\2/g' >> $(MAKEFILE); \
- done; \
- echo -ne "\nVFS_CFLAGS\t= \nVFS_CPPFLAGS\t= \nVFS_LDFLAGS\t= \n" >> $(MAKEFILE)
- make
-
# Pattern rules
-%.so: %.lo
- $(LIBTOOL) $(CC) $(LDSHFLAGS) $(LDFLAGS) -o $@ $<
+%.so: %.o
+ $(CC) $(LDSHFLAGS) $(LDFLAGS) -o $@ $<
-%.lo: %.c
- $(LIBTOOL) $(CC) $(FLAGS) -c $<
+%.o: %.c
+ $(CC) $(FLAGS) -c $<
# Misc targets
clean:
rm -rf .libs
rm -f core *~ *% *.bak \
- $(VFS_OBJS) $(VFS_OBJS:.so=.o) $(VFS_OBJS:.so=.lo)
+ $(VFS_OBJ) $(VFS_OBJS)
diff --git a/examples/VFS/block/block.c b/examples/VFS/block/block.c
index 9478b75f0f..6566bf3d8c 100644
--- a/examples/VFS/block/block.c
+++ b/examples/VFS/block/block.c
@@ -87,7 +87,7 @@ static BOOL get_section(char *sect);
static BOOL get_parameter_value(char *param, char *value);
static BOOL load_param(void);
static BOOL search(struct stat *stat_buf);
-static BOOL dir_search(char *link, char *dir);
+static BOOL dir_search(char *linkstr, char *dir);
static BOOL enter_pblock_dir(char *dir);
@@ -346,12 +346,11 @@ static DIR *block_opendir(struct connection_struct *conn, char *fname)
char *dir_name = NULL;
struct stat stat_buf;
+ size_t len;
- dir_name = alloca((strlen(conn->origpath) + strlen(fname) + 2) * sizeof(char));
-
- pstrcpy(dir_name,conn->origpath);
- pstrcat(dir_name, "/");
- strncat(dir_name, fname, strcspn(fname,"/"));
+ len = strlen(conn->origpath) + 1 + strcspn(fname, "/");
+ asprintf(&dir_name, "%s/%s", conn->origpath, fname);
+ dir_name[len] = '\0';
if((lstat(dir_name,&stat_buf)) == 0)
{
@@ -397,13 +396,13 @@ static BOOL search(struct stat *stat_buf)
* Find dir in list to block id the starting point is link from a share
*/
-static BOOL dir_search(char *link, char *dir)
+static BOOL dir_search(char *linkstr, char *dir)
{
char buf[PATH_MAX +1], *ext_path;
int len = 0;
struct block_dir *tmp_pblock = pblock_dir;
- if((len = readlink(link,buf,sizeof(buf))) == -1)
+ if((len = readlink(linkstr, buf, sizeof(buf))) == -1)
{
return TRUE;
@@ -413,9 +412,9 @@ static BOOL dir_search(char *link, char *dir)
}
- if((ext_path = strchr(dir,'/')) != NULL)
+ if((ext_path = strchr(dir, '/')) != NULL)
{
- pstrcat(buf,&ext_path[1]);
+ pstrcat(buf, &ext_path[1]);
len = strlen(buf);
}
@@ -427,7 +426,7 @@ static BOOL dir_search(char *link, char *dir)
continue;
}
- if((strstr(buf,tmp_pblock->dir_name)) != NULL)
+ if((strstr(buf, tmp_pblock->dir_name)) != NULL)
{
return TRUE;
}