[gs-cvs] gs/src

[Jouk Jansen]

Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv11935/gs/src

Modified Files:
	devs.mak imainarg.c zfile.c 
Log Message:

 Committing in .
 
 Long promised type cast changes neede to supress warnings on OpenVMS
 devs.mak : In a condition in a Makefile for OpenVMS the ":" should be
            surrounded by spaces.
 
 Modified Files:
 	gs/src/devs.mak gs/src/imainarg.c gs/src/zfile.c 
 ----------------------------------------------------------------------


Index: devs.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/devs.mak,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- devs.mak	28 Feb 2002 22:23:39 -0000	1.53
+++ devs.mak	7 Mar 2002 08:35:16 -0000	1.54
@@ -633,10 +633,10 @@
 ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
  $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
 
-$(DD)ijs.dev: $(ijs_) $(GLD)page.dev $(DD)ijslib.dev
+$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev
 	$(SETPDEV) $(DD)ijs $(ijs_)
 
-$(GLOBJ)gdevijs.$(OBJ): $(GLSRC)gdevijs.c $(PDEVH) \
+$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) \
  $(ijs_h) $(ijs_client_h)
 	$(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
 

Index: imainarg.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/imainarg.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- imainarg.c	26 Feb 2002 16:09:15 -0000	1.19
+++ imainarg.c	7 Mar 2002 08:35:16 -0000	1.20
@@ -684,7 +684,7 @@
 
     if (code < 0)
         return code;
-    minst->i_ctx_p->filearg = arg;	/* allow reading this file if SAFER set */
+    minst->i_ctx_p->filearg = (unsigned char*) arg;	/* allow reading this file if SAFER set */
     if (minst->run_buffer_size) {
 	/* Run file with run_string. */
 	return run_buffered(minst, arg);

Index: zfile.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/zfile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- zfile.c	21 Feb 2002 22:24:54 -0000	1.15
+++ zfile.c	7 Mar 2002 08:35:16 -0000	1.16
@@ -161,7 +161,8 @@
      */
     if (i_ctx_p->LockFilePermissions &&
 	    (gp_file_name_references_parent(fname, len) ||
-               string_match(fname, len, "%pipe*", 5, NULL))
+               string_match( (const unsigned char*) fname, len,
+			     (const unsigned char*) "%pipe*", 5, NULL))
        ) {
 	return e_invalidfileaccess;
     }
@@ -177,8 +178,8 @@
 	    r_type(&permitstring) != t_string
 	   )    
 	    break;	/* any problem, just fail */
-        if (string_match(fname, len, permitstring.value.bytes,
-		r_size(&permitstring), 
+        if (string_match( (const unsigned char*) fname, len,
+			  permitstring.value.bytes, r_size(&permitstring), 
 		filenamesep[0] == 0 ? &win_filename_params : NULL)
 	   )
 	    return 0;		/* success */
@@ -583,7 +584,8 @@
 	if (i_ctx_p->LockFilePermissions &&
 	    (i_ctx_p->filearg == NULL ||
 	    bytes_compare(op->value.bytes, r_size(op),
-	    (const byte *)i_ctx_p->filearg, strlen(i_ctx_p->filearg)) != 0)
+	    (const byte *)i_ctx_p->filearg,
+			  strlen( (const char*) i_ctx_p->filearg)) != 0)
 	   ) {
 	    /* Check to see if this file is allowed */
 	    /* Possibly we should allow access to parent directories if */