add a "strcat_len()" macro and use itHAL_GOBJECT_BRANCHPOINT

2 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 45da351b..2c0bab12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-03-29  Robert Love  <rml@ximian.com>
 
+	* tools/linux/hal_hotplug.c: add a "strcat_len()" macro and use it
+	
+2004-03-29  Robert Love  <rml@ximian.com>
+
 	* tools/linux/hal_hotplug.c: sysfs_mnt_path should be a "char []"
 	  not a "char * []", also use PATH_MAX instead of 255, and finally
 	  use "const char" as appropriate
diff --git a/tools/linux/hal_hotplug.c b/tools/linux/hal_hotplug.c
index ef5ab527..10a5c8d6 100644
--- a/tools/linux/hal_hotplug.c
+++ b/tools/linux/hal_hotplug.c
@@ -138,6 +138,12 @@ static const char *file_list_pci[] = {
 	NULL
 };
 
+/* safely strcat() at most the remaining space in 'dst' */
+#define strcat_len(dst, src) do { \
+	dst[sizeof (dst) - 1] = '\0'; \
+	strncat (dst, src, sizeof (dst) - strlen (dst) - 1); \
+} while(0)
+
 static int
 wait_for_sysfs_info (char *devpath, char *hotplug_type)
 {
@@ -206,7 +212,7 @@ wait_for_sysfs_info (char *devpath, char *hotplug_type)
 
 	/* first, check directory */
 	strncpy (path, sysfs_mnt_path, PATH_MAX);
-	strncat (path, devpath, PATH_MAX);
+	strcat_len (path, devpath);
 
 	/*printf("path0 = %s\n", path); */
 
@@ -221,10 +227,9 @@ wait_for_sysfs_info (char *devpath, char *hotplug_type)
 
 		file = file_list[i];
 		strncpy (path, sysfs_mnt_path, PATH_MAX);
-		strncat (path, devpath, PATH_MAX);
-		strncat (path, "/", PATH_MAX);
-		strncat (path, file, PATH_MAX);
-
+		strcat_len (path, devpath);
+		strcat_len (path, "/");
+		strcat_len (path, file);
 		/*printf("path1 = %s\n", path); */
 
 		rc = stat (path, &stat_buf);