[Serverfilters-commit] script filtercmd.c,1.9,1.10

[<ton...@us...>]

Update of /cvsroot/serverfilters/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12329

Modified Files:
	filtercmd.c 
Log Message:
Improved reporting of certain errors

Index: filtercmd.c
===================================================================
RCS file: /cvsroot/serverfilters/script/filtercmd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** filtercmd.c	29 Feb 2004 22:57:04 -0000	1.9
--- filtercmd.c	1 Mar 2004 01:22:10 -0000	1.10
***************
*** 185,191 ****
  				}
  
! 				if (!findfilterfile(argv[2], filter_file, STR_MAX)) {
! 					return inerror(ERR_BAD_RC_PATH);
! 				}        
  
  				return getrc(filter_file);
--- 185,190 ----
  				}
  
! 				err = findfilterfile(argv[2], filter_file, STR_MAX);
! 				if (err) return inerror(err);
  
  				return getrc(filter_file);
***************
*** 195,201 ****
                                          return ERR_USAGE;
                                  }
! 				if (!findfilterfile(argv[2], filter_file, STR_MAX)) {
! 					return inerror(ERR_BAD_RC_PATH);
! 				}        
  
  				return putrc(filter_file, UID, GID);
--- 194,200 ----
                                          return ERR_USAGE;
                                  }
! 
! 				err = findfilterfile(argv[2], filter_file, STR_MAX);
! 				if (err) return inerror(err);
  
  				return putrc(filter_file, UID, GID);
***************
*** 205,211 ****
                                          return ERR_USAGE;
                                  }
! 				if (!findfilterfile(argv[2], filter_file, STR_MAX)) {
! 					return inerror(ERR_BAD_RC_PATH);
! 				}        
  
  				return rcexists(filter_file);
--- 204,209 ----
                                          return ERR_USAGE;
                                  }
! 				err = findfilterfile(argv[2], filter_file, STR_MAX);
! 				if (err) return inerror(err);
  
  				return rcexists(filter_file);
***************
*** 495,498 ****
--- 493,498 ----
  	fprintf(stderr, "filter_file: %s\n", filter_file);
  	#endif
+ 	
+ 	return ERR_OK;
  }