[Glibc-bsd-commits] r2933 - trunk/freebsd-utils/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-17 12:26:25 +0000 (Sun, 17 Jan 2010)
New Revision: 2933

Modified:
   trunk/freebsd-utils/debian/patches/024_devfs.diff
Log:
patches/024_devfs.diff: force POSIX compliance to make sure the
arguments passed to devfs are not reordered



Modified: trunk/freebsd-utils/debian/patches/024_devfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/024_devfs.diff	2010-01-16 23:29:32 UTC (rev 2932)
+++ trunk/freebsd-utils/debian/patches/024_devfs.diff	2010-01-17 12:26:25 UTC (rev 2933)
@@ -10,7 +10,7 @@
  extern int mpfd;		/* Mount-point file descriptor. */
  
 --- a/sbin/devfs/Makefile
-+++ b/sbin/devfs/Makefile	
++++ b/sbin/devfs/Makefile
 @@ -4,5 +4,6 @@
  SRCS=	devfs.c rule.c
  MAN=	devfs.8
@@ -29,15 +29,17 @@
  
  #include "extern.h"
  
-@@ -85,7 +87,7 @@
+@@ -85,8 +87,8 @@
  	int ch;
  
  	setprogname("devfs rule");
 -	optreset = optind = 1;
+-	while ((ch = getopt(ac, av, "s:")) != -1)
 +	optind = 1;
- 	while ((ch = getopt(ac, av, "s:")) != -1)
++	while ((ch = getopt(ac, av, "+s:")) != -1)
  		switch (ch) {
  		case 's':
+ 			in_rsnum = eatonum(optarg);
 @@ -125,7 +127,7 @@
  }
  
@@ -101,3 +103,14 @@
      devfs_rsnum rsnum)
  {
  	struct intstr *is;
+--- a/sbin/devfs/devfs.c
++++ b/sbin/devfs/devfs.c
+@@ -62,7 +62,7 @@
+ 	int ch;
+ 
+ 	mountpt = NULL;
+-	while ((ch = getopt(ac, av, "m:")) != -1)
++	while ((ch = getopt(ac, av, "+m:")) != -1)
+ 		switch (ch) {
+ 		case 'm':
+ 			mountpt = optarg;