[agd-cvs] server/src sys.c,1.19,1.20

[Peep P. <so...@us...>]

Update of /cvsroot/agd/server/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30902

Modified Files:
	sys.c 
Log Message:
add_slash()

Index: sys.c
===================================================================
RCS file: /cvsroot/agd/server/src/sys.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sys.c	23 Jul 2004 17:05:40 -0000	1.19
+++ sys.c	24 Jul 2004 17:49:21 -0000	1.20
@@ -56,7 +56,13 @@
 		}
 
 		if(strncmp(buf, "lib:", 4) == 0) {
+			int len;
 			fscanf(f, "%s\n", buf);
+			len = strlen(buf);
+			if(buf[len-1] != '/') {
+				buf[len] = '/';
+				buf[len+1] = '\0';
+			}
 			conf.lib_root = xstrdup(buf);
 			continue;
 		}
@@ -110,13 +116,6 @@
 	return p;
 }
 
-int legal_path(char *fn)
-{
-	char *p;
-	p = strstr(fn, "..");
-	return !p;
-}
-
 /* strdup() isn't ANSI, so we need this replacement. */
 char *xstrdup(char *s)
 {
@@ -125,6 +124,15 @@
 	return p;
 }
 
+int legal_path(char *fn)
+{
+	char *p;
+	p = strstr(fn, "..");
+	if(p)
+		return 0;
+	return 1;
+}
+
 /* This makes a copy of str, and adds ".lpc" to the end. */
 char *add_extension(char *str)
 {
@@ -149,6 +157,17 @@
 	return s;
 }
 
+void add_slash(char *path)
+{
+	int len;
+	len = strlen(path);
+	if(path[len-1] != '/') {
+		path = xrealloc(path, len + 2);
+		path[len] = '/';
+		path[len+1] = '\0';
+	}
+}
+
 int to_power(int base, int pow)
 {
 	int i, ret;