CVS commit: xsrc/external/mit/xman/dist

2017-01-10 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Tue Jan 10 21:50:59 UTC 2017

Modified Files:
xsrc/external/mit/xman/dist: search.c

Log Message:
need 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xman/dist/search.c

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/search.c
diff -u xsrc/external/mit/xman/dist/search.c:1.2 xsrc/external/mit/xman/dist/search.c:1.3
--- xsrc/external/mit/xman/dist/search.c:1.2	Sun Apr 24 13:37:02 2016
+++ xsrc/external/mit/xman/dist/search.c	Tue Jan 10 16:50:59 2017
@@ -28,9 +28,14 @@ from the X Consortium.
 
 */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include "globals.h"
 #include "vendor.h"
+#include /* sys/types.h and unistd.h included in here */
+#include 
 
 /* Map  and control-M to goto beginning of file. */

CVS commit: xsrc/external/mit/xman/dist

2016-04-24 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Sun Apr 24 17:37:02 UTC 2016

Modified Files:
xsrc/external/mit/xman/dist: search.c

Log Message:
CID 987986: Set umask before mkstemp


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xman/dist/search.c

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/search.c
diff -u xsrc/external/mit/xman/dist/search.c:1.1.1.3 xsrc/external/mit/xman/dist/search.c:1.2
--- xsrc/external/mit/xman/dist/search.c:1.1.1.3	Sun Jul 19 19:00:54 2015
+++ xsrc/external/mit/xman/dist/search.c	Sun Apr 24 13:37:02 2016
@@ -153,7 +153,7 @@ DoSearch(ManpageGlobals * man_globals, i
 char string_buf[BUFSIZ], cmp_str[BUFSIZ], error_buf[BUFSIZ];
 char *search_string = SearchString(man_globals);
 FILE *file;
-int fd;
+int fd, omask;
 int count;
 Boolean flag;
 
@@ -180,7 +180,9 @@ DoSearch(ManpageGlobals * man_globals, i
 char label[BUFSIZ];
 
 strcpy(tmp, MANTEMP);   /* get a temp file. */
+	omask = umask(077);
 fd = mkstemp(tmp);
+	umask(omask);
 if (fd < 0) {
 PopupWarning(man_globals, "Cant create temp file");
 return NULL;

CVS commit: xsrc/external/mit/xman/dist

2016-04-24 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Sun Apr 24 17:36:11 UTC 2016

Modified Files:
xsrc/external/mit/xman/dist: misc.c

Log Message:
CID 987984: set umask before mkstemp


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xman/dist/misc.c

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.7 xsrc/external/mit/xman/dist/misc.c:1.8
--- xsrc/external/mit/xman/dist/misc.c:1.7	Sun Jul 19 19:04:04 2015
+++ xsrc/external/mit/xman/dist/misc.c	Sun Apr 24 13:36:11 2016
@@ -374,7 +374,7 @@ UncompressNamed(ManpageGlobals * man_glo
 {
 char tmp[BUFSIZ], cmdbuf[BUFSIZ], error_buf[BUFSIZ];
 struct stat junk;
-int fd;
+int fd, omask;
 
 if (stat(filename, ) != 0) {   /* Check for existence of the file. */
 if (errno != ENOENT) {
@@ -392,7 +392,9 @@ UncompressNamed(ManpageGlobals * man_glo
  */
 
 strcpy(tmp, MANTEMP);   /* get a temp file. */
+omask = umask(077);
 fd = mkstemp(tmp);
+umask(omask);
 if (fd < 0) {
 PopupWarning(man_globals, "Error creating a temp file");
 return FALSE;
@@ -450,7 +452,7 @@ SgmlToRoffNamed(ManpageGlobals * man_glo
 {
 char tmp[BUFSIZ], cmdbuf[BUFSIZ], error_buf[BUFSIZ];
 struct stat junk;
-int fd;
+int fd, omask;
 
 if (stat(filename, ) != 0) {   /* Check for existence of the file. */
 if (errno != ENOENT) {
@@ -463,7 +465,9 @@ SgmlToRoffNamed(ManpageGlobals * man_glo
 }
 
 strcpy(tmp, MANTEMP);   /* get a temp file. */
+omask = umask(077):
 fd = mkstemp(tmp);
+umask(omask);
 if (fd < 0) {
 PopupWarning(man_globals, "Error creating a temp file");
 return FALSE;
@@ -503,7 +507,7 @@ FILE *
 Format(ManpageGlobals * man_globals, const char *entry)
 {
 FILE *file = NULL;
-int fd;
+int fd, omask;
 
 Widget manpage = man_globals->manpagewidgets.manpage;
 char cmdbuf[BUFSIZ], tmp[BUFSIZ], filename[BUFSIZ], error_buf[BUFSIZ];
@@ -559,7 +563,9 @@ Format(ManpageGlobals * man_globals, con
 XFlush(XtDisplay(man_globals->standby));
 
 strcpy(tmp, MANTEMP);   /* Get a temp file. */
+omask = umask(077);
 fd = mkstemp(tmp);
+umask(omask);
 if (fd >= 0) {
 file = fdopen(fd, "r");
 if (file == NULL) {

CVS commit: xsrc/external/mit/xman/dist

2015-07-20 Thread Thomas Klausner 
Module Name:xsrc
Committed By:   wiz
Date:   Mon Jul 20 08:20:04 UTC 2015

Modified Files:
xsrc/external/mit/xman/dist: handler.c

Log Message:
Fix mismerge.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xman/dist/handler.c

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/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.5 xsrc/external/mit/xman/dist/handler.c:1.6
--- xsrc/external/mit/xman/dist/handler.c:1.5	Sun Jul 19 23:04:04 2015
+++ xsrc/external/mit/xman/dist/handler.c	Mon Jul 20 08:20:04 2015
@@ -320,7 +320,7 @@ SaveFormattedPage(Widget w, XEvent * eve
  * If we are not active then take no action.
  */
 
-if (man_globals-tempfile == NULL || man_globals-tempfile[0] == '\0')
+if (man_globals-tempfile[0] == '\0')
 return;
 
 switch (params[0][0]) {

CVS commit: xsrc/external/mit/xman/dist

2014-03-30 Thread Thomas Klausner 
Module Name:xsrc
Committed By:   wiz
Date:   Sun Mar 30 18:46:06 UTC 2014

Modified Files:
xsrc/external/mit/xman/dist: handler.c

Log Message:
ifdef out senseless code that clang complains about with 
-Wtautological-pointer-compare.

I've asked upstream what check was really intended here.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/handler.c

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/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.3 xsrc/external/mit/xman/dist/handler.c:1.4
--- xsrc/external/mit/xman/dist/handler.c:1.3	Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xman/dist/handler.c	Sun Mar 30 18:46:06 2014
@@ -320,8 +320,10 @@ SaveFormattedPage(Widget w, XEvent * eve
  * If we are not active then take no action.
  */
 
+#if ARRAY_COMPARISON_TO_NULL_POINTER_MAKES_SENSE
 if (man_globals-tempfile == NULL)
 return;
+#endif
 
 switch (params[0][0]) {
 case 'S':

CVS commit: xsrc/external/mit/xman/dist

2014-03-05 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Wed Mar  5 21:35:04 UTC 2014

Modified Files:
xsrc/external/mit/xman/dist: handler.c

Log Message:
Drop tautologic check.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xman/dist/handler.c

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/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.1.1.4 xsrc/external/mit/xman/dist/handler.c:1.2
--- xsrc/external/mit/xman/dist/handler.c:1.1.1.4	Sat Jul 23 05:56:02 2011
+++ xsrc/external/mit/xman/dist/handler.c	Wed Mar  5 21:35:04 2014
@@ -320,8 +320,6 @@ SaveFormattedPage(Widget w, XEvent * eve
  * If we are not active then take no action.
  */
 
-  if (man_globals-tempfile == NULL) return;
-
   switch (params[0][0]) {
   case 'S':
   case 's':

CVS commit: xsrc/external/mit/xman/dist

2012-07-17 Thread Thomas Klausner 
Module Name:xsrc
Committed By:   wiz
Date:   Tue Jul 17 18:51:16 UTC 2012

Modified Files:
xsrc/external/mit/xman/dist: misc.c vendor.h

Log Message:
Change local patch to version that was committed upstream as
a52a5150dd353a6dcc8db1720d0616d14b14905e


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xman/dist/misc.c \
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.4 xsrc/external/mit/xman/dist/misc.c:1.5
--- xsrc/external/mit/xman/dist/misc.c:1.4	Sat Jul 23 06:01:41 2011
+++ xsrc/external/mit/xman/dist/misc.c	Tue Jul 17 18:51:16 2012
@@ -764,7 +764,7 @@ ConstructCommand(cmdbuf, path, filename,
 filter = GRAP;
 break;
  case 'p':
-filter = XMAN_PIC;
+filter = ROFF_PIC;
 break;
  case 't':
 filter = TBL;
Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.4 xsrc/external/mit/xman/dist/vendor.h:1.5
--- xsrc/external/mit/xman/dist/vendor.h:1.4	Mon Nov  9 00:23:31 2009
+++ xsrc/external/mit/xman/dist/vendor.h	Tue Jul 17 18:51:16 2012
@@ -198,7 +198,7 @@ from the X Consortium.
 # define EQN		eqn
 # define TBL		tbl
 # define GRAP		grap
-# define XMAN_PIC	pic
+# define ROFF_PIC	pic
 # define VGRIND		vgrind
 # define REFER		refer
 # if defined(CSRG_BASED)

CVS commit: xsrc/external/mit/xman/dist

2011-07-23 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 06:01:42 UTC 2011

Modified Files:
xsrc/external/mit/xman/dist: misc.c
Removed Files:
xsrc/external/mit/xman/dist: xman.man

Log Message:
merge xman 1.1.2


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xman/dist/xman.man

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.3 xsrc/external/mit/xman/dist/misc.c:1.4
--- xsrc/external/mit/xman/dist/misc.c:1.3	Mon Nov  9 00:23:31 2009
+++ xsrc/external/mit/xman/dist/misc.c	Sat Jul 23 06:01:41 2011
@@ -90,7 +90,7 @@
 }
 
 void
-PopupWarning(ManpageGlobals * man_globals, char * string)
+PopupWarning(ManpageGlobals * man_globals, const char * string)
 {
   int n;
   Arg wargs[3];
@@ -263,7 +263,7 @@
 	  return(file);
 #endif
   {
-sprintf(filename, %s/%s%s/%s.%s, path, CAT,
+snprintf(filename, sizeof(filename), %s/%s%s/%s.%s, path, CAT,
 	section + len_cat, page, BZIP2_EXTENSION);
 if ( (file = Uncompress(man_globals, filename)) != NULL)
   return(file);
@@ -271,7 +271,7 @@
 #endif
 #ifdef LZMA_EXTENSION
   {
-sprintf(filename, %s/%s%s/%s.%s, path, CAT,
+snprintf(filename, sizeof(filename), %s/%s%s/%s.%s, path, CAT,
 	section + len_cat, page, LZMA_EXTENSION);
 if ( (file = Uncompress(man_globals, filename)) != NULL)
   return(file);
@@ -320,7 +320,7 @@
 static FILE *
 Uncompress(ManpageGlobals * man_globals, char * filename)
 {
-  char tmp_file[BUFSIZ], error_buf[BUFSIZ];
+  char tmp_file[BUFSIZ];
   FILE * file;
 
 #ifndef HAS_MKSTEMP
@@ -328,15 +328,13 @@
 return(NULL);
 
   else if ((file = fopen(tmp_file, r)) == NULL) {
-  sprintf(error_buf, Something went wrong in retrieving the %s,
-	  uncompressed manual page try cleaning up /tmp.);
-  PopupWarning(man_globals, error_buf);
+  PopupWarning(man_globals, Something went wrong in retrieving the 
+		   uncompressed manual page try cleaning up /tmp.);
   }
 #else
   if (!UncompressNamed(man_globals, filename, tmp_file, file)) {
-  sprintf(error_buf, Something went wrong in retrieving the %s,
-	  uncompressed manual page try cleaning up /tmp.);
-  PopupWarning(man_globals, error_buf);
+  PopupWarning(man_globals, Something went wrong in retrieving the 
+		   uncompressed manual page try cleaning up /tmp.);
   return(NULL);
   }
 #endif
@@ -406,13 +404,13 @@
 #ifdef BZIP2_EXTENSION
   if (streq(filename + strlen(filename) - strlen(BZIP2_EXTENSION),
 	BZIP2_EXTENSION))
-sprintf(cmdbuf, BUNZIP2_FORMAT, filename, output);
+snprintf(cmdbuf, sizeof(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);
+snprintf(cmdbuf, sizeof(cmdbuf), UNLZMA_FORMAT, filename, output);
   else
 #endif
   snprintf(cmdbuf, sizeof(cmdbuf), UNCOMPRESS_FORMAT, filename, output);
@@ -583,8 +581,7 @@
 #else
   /* Handle more flexible way of specifying the formatting pipeline */
   if (! ConstructCommand(cmdbuf, path, filename, man_globals-tempfile)) {
- sprintf(error_buf, Constructed command was too long!);
- PopupWarning(man_globals, error_buf);
+ PopupWarning(man_globals, Constructed command was too long!);
  file = NULL;
   }
   else
@@ -599,9 +596,8 @@
   else {
 #ifndef HAS_MKSTEMP
 if ((file = fopen(man_globals-tempfile,r)) == NULL) {
-  sprintf(error_buf, Something went wrong in retrieving the %s,
-	  temp file, try cleaning up /tmp);
-  PopupWarning(man_globals, error_buf);
+  PopupWarning(man_globals, Something went wrong in retrieving the 
+		   temp file, try cleaning up /tmp);
 }
 else {
 #endif
@@ -697,7 +693,7 @@
FILE *file;
char fmtbuf[128];
int gotfmt = 0; /* set to 1 if we got a directive from source */
-   char *fname = NULL;
+   char fname[PATH_MAX];
 #ifdef __UNIXOS2__
int i;
 #endif
@@ -712,12 +708,9 @@
* use system to get the thing to a known absoute filename.
*/
   if (filename[0] == '/') {
- fname = filename;
+ snprintf(fname, sizeof(fname), %s, filename);
   } else {
- fname = malloc(strlen(path) + 1 + strlen(filename) + 1);
- if (!fname)
-return FALSE;
- sprintf(fname, %s/%s, path, filename);
+ snprintf(fname, sizeof(fname), %s/%s, path, filename);
   }
   if ((file = fopen(fname, r)) 
   (fgets(fmtbuf, sizeof(fmtbuf), file)) 
@@ -731,8 +724,6 @@
 gotfmt++;
  }
   }
-  if (fname  fname != filename)
- free(fname);
   if (!gotfmt)/* not there or some error */
   {

CVS commit: xsrc/external/mit/xman/dist

2011-07-22 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 23 05:56:05 UTC 2011

Update of /cvsroot/xsrc/external/mit/xman/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15465

Log Message:
initial import of xman-1.1.2

Status:

Vendor Tag: xorg
Release Tags:   xman-1-1-2

U xsrc/external/mit/xman/dist/ChangeLog
U xsrc/external/mit/xman/dist/config.guess
U xsrc/external/mit/xman/dist/help.c
U xsrc/external/mit/xman/dist/Makefile.in
U xsrc/external/mit/xman/dist/defs.h
U xsrc/external/mit/xman/dist/globals.c
U xsrc/external/mit/xman/dist/ScrollByL.h
U xsrc/external/mit/xman/dist/search.c
U xsrc/external/mit/xman/dist/icon_help.h
U xsrc/external/mit/xman/dist/vendor.h
U xsrc/external/mit/xman/dist/configure
U xsrc/external/mit/xman/dist/icon_open.h
U xsrc/external/mit/xman/dist/Makefile.am
U xsrc/external/mit/xman/dist/man.h
U xsrc/external/mit/xman/dist/INSTALL
U xsrc/external/mit/xman/dist/buttons.c
U xsrc/external/mit/xman/dist/ScrollByLP.h
U xsrc/external/mit/xman/dist/handler.c
U xsrc/external/mit/xman/dist/install-sh
U xsrc/external/mit/xman/dist/xman.help
U xsrc/external/mit/xman/dist/aclocal.m4
U xsrc/external/mit/xman/dist/vendor.c
U xsrc/external/mit/xman/dist/ScrollByL.c
U xsrc/external/mit/xman/dist/depcomp
U xsrc/external/mit/xman/dist/README
U xsrc/external/mit/xman/dist/missing
U xsrc/external/mit/xman/dist/tkfuncs.c
C xsrc/external/mit/xman/dist/misc.c
U xsrc/external/mit/xman/dist/globals.h
U xsrc/external/mit/xman/dist/config.h.in
U xsrc/external/mit/xman/dist/main.c
U xsrc/external/mit/xman/dist/config.sub
U xsrc/external/mit/xman/dist/COPYING
U xsrc/external/mit/xman/dist/man.c
U xsrc/external/mit/xman/dist/iconclosed.h
U xsrc/external/mit/xman/dist/configure.ac
U xsrc/external/mit/xman/dist/app-defaults/Xman
N xsrc/external/mit/xman/dist/man/Makefile.am
N xsrc/external/mit/xman/dist/man/Makefile.in
N xsrc/external/mit/xman/dist/man/xman.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xman/dist

CVS commit: xsrc/external/mit/xman/dist

2009-11-08 Thread matthew green 
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;
+

CVS commit: xsrc/external/mit/xman/dist

2009-05-01 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Fri May  1 15:18:54 UTC 2009

Modified Files:
xsrc/external/mit/xman/dist: misc.c vendor.h

Log Message:
s/PIC/XMAN_PIC/


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.2 -r1.3 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.1.1.1 xsrc/external/mit/xman/dist/misc.c:1.2
--- xsrc/external/mit/xman/dist/misc.c:1.1.1.1	Wed Jul 30 00:30:15 2008
+++ xsrc/external/mit/xman/dist/misc.c	Fri May  1 11:18:54 2009
@@ -739,7 +739,7 @@
 filter = GRAP;
 break;
  case 'p':
-filter = PIC;
+filter = XMAN_PIC;
 break;
  case 't':
 filter = TBL;

Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.2 xsrc/external/mit/xman/dist/vendor.h:1.3
--- xsrc/external/mit/xman/dist/vendor.h:1.2	Wed Jan 28 09:07:22 2009
+++ xsrc/external/mit/xman/dist/vendor.h	Fri May  1 11:18:54 2009
@@ -187,8 +187,7 @@
 # define EQN		eqn
 # define TBL		tbl
 # define GRAP		grap
-# undef PIC	/* we don't care about position independent code */
-# define PIC		pic
+# define XMAN_PIC	pic
 # define VGRIND		vgrind
 # define REFER		refer
 # if defined(CSRG_BASED)