Replaces ConcNameAndVersion and ConcDirAndName macros with functions

inc/dirdefs.h

@@ -58,7 +58,7 @@ typedef struct dfinfo {
 } DFINFO;
 
 #ifdef DOS
-int make_old_version(char *old, char *file);
+int make_old_version(char *old, size_t oldsize, char *file);
 #endif
 #ifdef FSDEBUG
 void print_finfo(FINFO *fp);

inc/dskdefs.h

@@ -19,7 +19,9 @@ LispPTR COM_writepage(LispPTR *args);
 LispPTR COM_truncatefile(LispPTR *args);
 LispPTR COM_changedir(LispPTR *args);
 LispPTR COM_getfreeblock(LispPTR *args);
-void separate_version(char *name, char *ver, int checkp);
+void conc_dir_and_name(char *dir, char *name, char *fname, size_t fname_size);
+void conc_name_and_version(char *name, char *ver, char *rname, size_t rname_size);
+void separate_version(char *name, size_t namesize, char *ver, size_t versize, int checkp);
 int unpack_filename(char *file, char *dir, char *name, char *ver, int checkp);
-int true_name(char *path);
+int true_name(char *path, size_t pathsize);
 #endif

inc/locfile.h

@@ -410,90 +410,6 @@ do  {				\
 	}									\
   } while (0)
 
-/*		
- * Name:	ConcDirAndName
- *
- * Argument:	char	*dir	The name of the directory.
- *		char	*name	The name of a file.
- *		char	*fname	The place where the full file name should be
- *				stored.
- * Value:	N/A
- *
- * Side Effect:	fname is replaced with the full file name.
- *
- * Description:
- *
- * Concatenate the directory name and root file name.  Checks if dir contains
- * the trail directory delimiter or not.
- *
- */
-
-#define ConcDirAndName(dir, name, fname) do {					\
-									\
-	char	*lf_cp1, *lf_cp2;					\
-									\
-	lf_cp1 = dir;							\
-	lf_cp2 = dir;							\
-									\
-	while (*lf_cp2 != '\0') {						\
-		switch (*lf_cp2) {						\
-									\
-		      case '/':						\
-			lf_cp1 = lf_cp2;					\
-			lf_cp2++;						\
-			break;						\
-									\
-		      default:						\
-			lf_cp2++;						\
-			break;						\
-		}							\
-	}								\
-	if (lf_cp1 == (lf_cp2 - 1)) {						\
-                if (lf_cp1 == (dir)) {					\
-			/* dir is a root directory. */			\
-			strcpy(fname, "/");				\
-			strcat(fname, name);				\
-		} else {						\
-			/* The trail directory is included. */		\
-			strcpy(fname, dir);				\
-			strcat(fname, name);				\
-		}							\
-	} else {							\
-		/* The trail directory is not included */		\
-		strcpy(fname, dir);					\
-		strcat(fname, "/");					\
-		strcat(fname, name);					\
-	}								\
-  } while (0)
-
-/*		
- * Name:	ConcNameAndVersion
- *
- * Argument:	char	*name	The root file name.
- *		char	*ver	The file version.
- *		char	*rname 	The place where the concatenated file name will be
- *				stored.
- * Value:	N/A
- *
- * Side Effect:	rname is replaced with the concatenated file name.
- *
- * Description:
- *
- * Concatenate the root file name and its version in UNIX format.
- *
- */
-
-#define ConcNameAndVersion(name, ver, rname) do {				\
-	if (*(ver) != '\0') {						\
-		strcpy(rname, name);					\
-		strcat(rname, ".~");					\
-		strcat(rname, ver);					\
-		strcat(rname, "~");					\
-	} else {							\
-		strcpy(rname, name);					\
-	}								\
-} while (0)
-
 #define	 VERSIONLEN		16
 
 #define	MAXVERSION		999999999

inc/timeout.h

@@ -38,9 +38,8 @@ extern	unsigned int TIMEOUT_TIME;
   } while (0)
 
 #define	S_TOUT(exp)	\
-  alarm(TIMEOUT_TIME),                  \
-    (exp),                              \
-    alarm(0)
+  alarm(TIMEOUT_TIME),  \
+    (exp)
 
 #define	ERRSETJMP(rval)					\
   do {							\

inc/ufsdefs.h

@@ -6,14 +6,11 @@ LispPTR UFS_deletefile(LispPTR *args);
 LispPTR UFS_renamefile(LispPTR *args);
 LispPTR UFS_directorynamep(LispPTR *args);
 #ifdef DOS
-int unixpathname(char *src, char *dst, int versionp, int genp, char *drive, int *extlenptr, char *rawname);
+int unixpathname(char *src, char *dst, int dstlen, int versionp, int genp, char *drive, int *extlenptr, char *rawname);
 #else
-int unixpathname(char *src, char *dst, int versionp, int genp);
+int unixpathname(char *src, char *dst, size_t dstlen, int versionp, int genp);
 #endif
-int lisppathname(char *fullname, char *lispname, int dirp, int versionp);
-int quote_fname(char *file);
-int quote_fname_ufs(char *file);
-int quote_dname(char *dir);
+int lisppathname(char *fullname, char *lispname, size_t lispnamesize, int dirp, int versionp);
 #ifdef DOS
 init_host_filesystem(void);
 exit_host_filesystem(void);