hurd/trans/streamio.c

[Nicola Girardi]

Hi.

Another one-liner untested fix. I think that --rdev couldn't work if
the ID was in the form MAJOR,MINOR. Also, I avoided a goto call that
seemed superfluous to me.

As for last time, please correct me if I'm mistaken.

--- /home/nicola/.hidden/cvsco/hurd/trans/streamio.c.orig       2002-06-21 
17:57:59.000000000 +0200
+++ /home/nicola/.hidden/cvsco/hurd/trans/streamio.c    2002-06-21 
17:57:19.000000000 +0200
@@ -234,7 +234,7 @@
         if (*end == ',')
           /* MAJOR,MINOR form */
           {
-            start = end;
+            start = end + 1;
             rdev = (rdev << 8) + strtoul (start, &end, 0);
           }
 
@@ -456,18 +456,16 @@
     exit (0);
 
   if (!force && ports_count_class (root_port_class) > 0)
-    goto busy;
+    {
+      ports_enable_class (root_port_class);
+      ports_resume_class_rpcs (root_port_class);
+      mutex_unlock (&global_lock);
+      return EBUSY;
+    }
 
   if (!nosync)
     dev_close ();
   exit (0);
-
- busy:
-  ports_enable_class (root_port_class);
-  ports_resume_class_rpcs (root_port_class);
-  mutex_unlock (&global_lock);
-
-  return EBUSY;
 }