patch-1.3.53 linux/init/main.c

• Lines: 27
• Date: Sat Dec 30 16:02:55 1995
• Orig file: v1.3.52/linux/init/main.c
• Orig date: Sat Dec 30 15:50:55 1995

diff -u --recursive --new-file v1.3.52/linux/init/main.c linux/init/main.c
@@ -390,13 +390,10 @@
 static void parse_options(char *line)
 {
 	char *next;
-#ifdef CONFIG_ROOT_NFS
-	char *devnames[] = { "nfs", "hda", "hdb", "hdc", "hdd", "sda", "sdb", "sdc", "sdd", "sde", "fd", "xda", "xdb", NULL };
-	int devnums[]    = { 0x0FF, 0x300, 0x340, 0x1600, 0x1640, 0x800, 0x810, 0x820, 0x830, 0x840, 0x200, 0xD00, 0xD40, 0};
-#else
-	static const char *devnames[] = { "hda", "hdb", "hdc", "hdd", "sda", "sdb", "sdc", "sdd", "sde", "fd", "xda", "xdb", NULL };
-	static int devnums[]    = { 0x300, 0x340, 0x1600, 0x1640, 0x800, 0x810, 0x820, 0x830, 0x840, 0x200, 0xD00, 0xD40, 0};
-#endif
+	char *devnames[] = { "nfs", "hda", "hdb", "hdc", "hdd", "sda", "sdb",
+		"sdc", "sdd", "sde", "fd", "xda", "xdb", NULL };
+	int devnums[]    = { 0x0FF, 0x300, 0x340, 0x1600, 0x1640, 0x800,
+		0x810, 0x820, 0x830, 0x840, 0x200, 0xD00, 0xD40, 0};
 	int args, envs;
 	if (!*line)
 		return;
@@ -435,7 +432,7 @@
 			ROOT_DEV = MKDEV(UNNAMED_MAJOR, 255);
 			if (line[0] == '/' || (line[0] >= '0' && line[0] <= '9')) {
 				strncpy(nfs_root_name, line, sizeof(nfs_root_name));
-				nfs_root_name[sizeof(nfs_root_name)] = '\0';
+				nfs_root_name[sizeof(nfs_root_name)-1] = '\0';
 				continue;
 			}
 			n = strlen(line) + strlen(NFS_ROOT);