[Xorg-commit] xc/extras/rman rman.c,1.1.4.1,1.1.4.2

Kaleb Keithley xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007


Committed by: kaleb

Update of /cvs/xorg/xc/extras/rman
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/rman

Modified Files:
      Tag: XORG-CURRENT
	rman.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: rman.c
===================================================================
RCS file: /cvs/xorg/xc/extras/rman/rman.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/rman.c	26 Nov 2003 22:48:29 -0000	1.1.4.1
+++ b/rman.c	23 Feb 2004 21:33:27 -0000	1.1.4.2
@@ -1,48 +1,24 @@
 #ifdef UNDEF
-static char rcsid[] = "Header: /home/cs/phelps/spine/rman/RCS/rman.c,v 1.144 1999/08/10 00:41:55 phelps Exp phelps $";
+static char cvsid[] = "Header: /usr/build/rman/rman-031225/phelps/RCS/rman.c,v 1.154 2003/07/26 19:00:48 phelps Exp $";
 #endif
 
 /*
    PolyglotMan by Thomas A. Phelps (phelps at ACM.org)
 
   accept man pages as formatted by (10)
-     Hewlett-Packard HP-UX, AT&T System V, SunOS, Sun Solaris, OSF/1, DEC Ultrix,
-	SGI IRIX, Linux, FreeBSD, SCO
[...1820 lines suppressed...]
 	assert(strchr(strgetopt,'v')!=NULL);
 	assert(strchr(strgetopt,':')!=NULL);
 
-#ifdef macintosh
-	extern void InitToolbox();
-	InitToolbox();
-#endif
-
 	/* count, sort exception strings */
 	for (lcexceptionslen=0; (p=lcexceptions[lcexceptionslen])!=NULL; lcexceptionslen++) /*empty*/;
 	qsort(lcexceptions, lcexceptionslen, sizeof(char*), lcexceptionscmp);
@@ -5436,7 +4934,7 @@
 		strcpy(plain,argvch[optind]);
 
 		if (freopen(argvch[optind], "r", stdin)==NULL) {
-			fprintf(stderr, "%s: can't open %s\n", argvch[0],argvch[optind]);
+			fprintf(stderr, "%s: can't open %s\n", argvch[0], argvch[optind]);
 			exit(1);
 		}
 	}





More information about the xorg-commit mailing list