ppcrcd/trunk/yaboot/file.c

[sparky]

Author: sparky
Date: Tue Mar  7 22:56:25 2006
New Revision: 7120

Modified:
   ppcrcd/trunk/yaboot/file.c
Log:
- comment out bullshit code
- spaces->tabs


Modified: ppcrcd/trunk/yaboot/file.c
==============================================================================
--- ppcrcd/trunk/yaboot/file.c	(original)
+++ ppcrcd/trunk/yaboot/file.c	Tue Mar  7 22:56:25 2006
@@ -40,108 +40,110 @@
 
 static char *netdev_path_to_filename(const char *path)
 {
-     char *tmp, *args, *filename;
-     size_t len;
+	char *tmp, *args, *filename;
+	size_t len;
 
-     DEBUG_F("path = %s\n", path);
+	DEBUG_F("path = %s\n", path);
 
-     if (!path)
-	  return NULL;
+	if (!path)
+		return NULL;
 
-     args = strrchr(path, ':');
-     if (!args)
-	  return NULL;
-
-     /* The obp-tftp device arguments should be at the end of
-      * the argument list.  Skip over any extra arguments (promiscuous,
-      * speed, duplex, bootp, rarp).
-      */
-
-     tmp = strstr(args, "promiscuous");
-     if (tmp && tmp > args)
-	  args = tmp + strlen("promiscuous");
-
-     tmp = strstr(args, "speed=");
-     if (tmp && tmp > args)
-	  args = tmp + strlen("speed=");
-
-     tmp = strstr(args, "duplex=");
-     if (tmp && tmp > args)
-	  args = tmp + strlen("duplex=");
-
-     tmp = strstr(args, "bootp");
-     if (tmp && tmp > args)
-	  args = tmp + strlen("bootp");
-
-     tmp = strstr(args, "rarp");
-     if (tmp && tmp > args)
-	  args = tmp + strlen("rarp");
-
-     args = strchr(args, ',');
-     if (!args)
-	  return NULL;
-
-     tmp = args;
-     tmp--;
-     /* If the preceding character is ':' then there were no
-      * non-obp-tftp arguments and we know we're right up to the
-      * filename.  Otherwise, we must advance args once more.
-      */
-     args++;
-     if (*tmp != ':') {
-	  args = strchr(args, ',');
-	  if (!args)
-	       return NULL;
-	  args++;
-     }
-
-     /* filename may be empty; e.g. enet:192.168.1.1,,192.168.1.2 */
-     if (*args == ',') {
-	  DEBUG_F("null filename\n");
-	  return NULL;
-     }
-
-     /* Now see whether there are more args following the filename. */
-     tmp = strchr(args, ',');
-     if (!tmp)
-	  len = strlen(args) + 1;
-     else
-	  len = tmp - args + 1;
-
-     filename = malloc(len);
-     if (!filename)
-	  return NULL;
+	args = strrchr(path, ':');
+	if (!args)
+		return NULL;
 
-     strncpy(filename, args, len);
-     filename[len - 1] = '\0';
+	/* The obp-tftp device arguments should be at the end of
+	 * the argument list.  Skip over any extra arguments (promiscuous,
+	 * speed, duplex, bootp, rarp).
+	 */
+
+	tmp = strstr(args, "promiscuous");
+	if (tmp && tmp > args)
+		args = tmp + strlen("promiscuous");
+
+	tmp = strstr(args, "speed=");
+	if (tmp && tmp > args)
+		args = tmp + strlen("speed=");
+
+	tmp = strstr(args, "duplex=");
+	if (tmp && tmp > args)
+		args = tmp + strlen("duplex=");
+
+	tmp = strstr(args, "bootp");
+	if (tmp && tmp > args)
+		args = tmp + strlen("bootp");
+
+	tmp = strstr(args, "rarp");
+	if (tmp && tmp > args)
+		args = tmp + strlen("rarp");
+
+	args = strchr(args, ',');
+	if (!args)
+		return NULL;
+
+	tmp = args;
+	tmp--;
+	/* If the preceding character is ':' then there were no
+	 * non-obp-tftp arguments and we know we're right up to the
+	 * filename.  Otherwise, we must advance args once more.
+	 */
+	args++;
+#if 0 // bullshit
+	if (*tmp != ':') {
+		args = strchr(args, ',');
+		if (!args)
+			return NULL;
+		args++;
+	}
+#endif
+
+	/* filename may be empty; e.g. enet:192.168.1.1,,192.168.1.2 */
+	if (*args == ',') {
+		DEBUG_F("null filename\n");
+		return NULL;
+	}
 
-     DEBUG_F("filename = %s\n", filename);
-     return filename;
+	/* Now see whether there are more args following the filename. */
+	tmp = strchr(args, ',');
+	if (!tmp)
+		len = strlen(args) + 1;
+	else
+		len = tmp - args + 1;
+
+	filename = malloc(len);
+	if (!filename)
+		return NULL;
+
+	strncpy(filename, args, len);
+	filename[len - 1] = '\0';
+
+	DEBUG_F("filename = %s\n", filename);
+	return filename;
 }
 
 static char *netdev_path_to_dev(const char *path)
 {
-     char *dev, *tmp;
-     size_t len;
+	char *dev, *tmp;
+	size_t len;
 
-     DEBUG_F("path = %s\n", path);
+	DEBUG_F("path = %s\n", path);
 
-     if (!path)
-	  return NULL;
+	if (!path)
+		return NULL;
 
-     tmp = strchr(path, ':');
-     if (!tmp)
-	  return strdup(path);
-     tmp++;
-
-     len = tmp - path + 1;
-
-     dev = malloc(len);
-     if (dev) {
-	  strncpy(dev, path, len);
-	  dev[len - 1] = '\0';
-     }
-     return dev;
+	tmp = strchr(path, ':');
+	if (!tmp)
+		return strdup(path);
+	tmp++;
+
+	len = tmp - path + 1;
+
+	dev = malloc(len);
+	if (dev) {
+		strncpy(dev, path, len);
+		dev[len - 1] = '\0';
+	}
+	return dev;
 }
 
 /* This function follows the device path in the devtree and separates