Module Name: xsrc
Committed By: mrg
Date: Mon Nov 9 00:23:31 UTC 2009
Modified Files:
xsrc/external/mit/xman/dist: misc.c vendor.h
Removed Files:
xsrc/external/mit/xman/dist: Xman-noxprint.ad Xman-xprint.ad print.c
print.h
Log Message:
merge xman 1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xman/dist/Xman-noxprint.ad \
xsrc/external/mit/xman/dist/Xman-xprint.ad \
xsrc/external/mit/xman/dist/print.c xsrc/external/mit/xman/dist/print.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/vendor.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.2 xsrc/external/mit/xman/dist/misc.c:1.3
--- xsrc/external/mit/xman/dist/misc.c:1.2 Fri May 1 15:18:54 2009
+++ xsrc/external/mit/xman/dist/misc.c Mon Nov 9 00:23:31 2009
@@ -81,7 +81,6 @@
* Returns: none
*/
-extern Widget top;
static Widget warnShell, warnDialog;
static void
@@ -255,6 +254,29 @@
return(file);
}
#endif
+#ifdef BZIP2_EXTENSION
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+ /* look in machine subdir first */
+ snprintf(filename, sizeof(filename), "%s/%s%s/%s/%s.%s", path, CAT,
+ section + len_cat, MACHINE, page, BZIP2_EXTENSION);
+ if ( (file = Uncompress(man_globals, filename)) != NULL)
+ return(file);
+#endif
+ {
+ sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
+ section + len_cat, page, BZIP2_EXTENSION);
+ if ( (file = Uncompress(man_globals, filename)) != NULL)
+ return(file);
+ }
+#endif
+#ifdef LZMA_EXTENSION
+ {
+ sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
+ section + len_cat, page, LZMA_EXTENSION);
+ if ( (file = Uncompress(man_globals, filename)) != NULL)
+ return(file);
+ }
+#endif
#else
for(i = 0; i < strlen(COMPRESSION_EXTENSIONS); i++) {
snprintf(filename, sizeof(filename), "%s/%s%s/%s.%c", path, CAT,
@@ -381,6 +403,18 @@
snprintf(cmdbuf, sizeof(cmdbuf), GUNZIP_FORMAT, filename, output);
else
#endif
+#ifdef BZIP2_EXTENSION
+ if (streq(filename + strlen(filename) - strlen(BZIP2_EXTENSION),
+ BZIP2_EXTENSION))
+ sprintf(cmdbuf, BUNZIP2_FORMAT, filename, output);
+ else
+#endif
+#ifdef LZMA_EXTENSION
+ if (streq(filename + strlen(filename) - strlen(LZMA_EXTENSION),
+ LZMA_EXTENSION))
+ sprintf(cmdbuf, UNLZMA_FORMAT, filename, output);
+ else
+#endif
snprintf(cmdbuf, sizeof(cmdbuf), UNCOMPRESS_FORMAT, filename, output);
if(system(cmdbuf) == 0) /* execute search. */
return(TRUE);
@@ -807,6 +841,9 @@
ParseEntry(entry, path, section, page);
+ man_globals->bzip2 = FALSE;
+ man_globals->lzma = FALSE;
+
#if defined(__OpenBSD__) || defined(__NetBSD__)
/*
* look for uncompressed file in machine subdir first
@@ -856,6 +893,43 @@
}
#endif /* GZIP_EXTENSION */
#endif /* __OpenBSD__ || __NetBSD__ */
+
+#ifdef BZIP2_EXTENSION
+ {
+ sprintf(input, "%s.%s", filename, BZIP2_EXTENSION);
+#ifndef HAS_MKSTEMP
+ if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+ if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->gzip = FALSE;
+ man_globals->bzip2 = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, BZIP2_EXTENSION);
+ return(TRUE);
+ }
+ }
+#endif /* BZIP2_EXTENSION */
+
+#ifdef LZMA_EXTENSION
+ {
+ sprintf(input, "%s.%s", filename, LZMA_EXTENSION);
+#ifndef HAS_MKSTEMP
+ if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+ if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->gzip = FALSE;
+ man_globals->lzma = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, LZMA_EXTENSION);
+ return(TRUE);
+ }
+ }
+#endif /* LZMA_EXTENSION */
+
/*
* Look for uncompressed file first.
*/
@@ -925,6 +999,41 @@
}
}
#endif
+
+#ifdef BZIP2_EXTENSION
+ {
+ sprintf(input, "%s.%s", filename, BZIP2_EXTENSION);
+#ifndef HAS_MKSTEMP
+ if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+ if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->gzip = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, BZIP2_EXTENSION);
+ return(TRUE);
+ }
+ }
+#endif
+
+#ifdef LZMA_EXTENSION
+ {
+ sprintf(input, "%s.%s", filename, LZMA_EXTENSION);
+#ifndef HAS_MKSTEMP
+ if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+ if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->lzma = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, LZMA_EXTENSION);
+ return(TRUE);
+ }
+ }
+#endif
+
/*
* And lastly files in a compressed directory.
*/
Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.3 xsrc/external/mit/xman/dist/vendor.h:1.4
--- xsrc/external/mit/xman/dist/vendor.h:1.3 Fri May 1 15:18:54 2009
+++ xsrc/external/mit/xman/dist/vendor.h Mon Nov 9 00:23:31 2009
@@ -59,7 +59,7 @@
# define SEARCHDIR MAN
#endif
-#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4)) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) )
+#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4)) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) || defined(__CYGWIN__) )
# define SEARCHOTHER CAT
#endif
@@ -137,6 +137,17 @@
# define GUNZIP_FORMAT "gzip -c -d < %s >> %s"
# endif
# define GZIP_COMPRESS "gzip"
+# define BZIP2_EXTENSION "bz2"
+# define LZMA_EXTENSION "lzma"
+# ifndef HAS_MKSTEMP
+# define BUNZIP2_FORMAT "bunzip2 -c -d < %s > %s"
+# define UNLZMA_FORMAT "unlzma -c -d < %s > %s"
+# else
+# define BUNZIP2_FORMAT "bunzip2 -c -d < %s >> %s"
+# define UNLZMA_FORMAT "unlzma -c -d < %s >> %s"
+# endif
+# define BZIP2_COMPRESS "bzip2"
+# define LZMA_COMPRESS "lzma"
#endif
@@ -172,7 +183,7 @@
# define FORMAT "| eqn | tbl | nroff -mandoc"
# elif defined(BSD) && (BSD >= 199103)
# define FORMAT "| eqn | tbl | nroff -man"
-# elif defined(linux)
+# elif defined(linux) || defined(__CYGWIN__)
# define FORMAT "| pic | eqn | tbl -Tlatin1 | GROFF_NO_SGR= groff -Tlatin1 -mandoc"
# else
# define FORMAT "| neqn | nroff -man" /* The format command. */
