cscope

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24815/src

Modified Files:
	dir.c 
Log Message:
fixing srcfiles to only include readable files (sourceforge bug 1040690)

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** dir.c	23 Jun 2004 15:41:59 -0000	1.21
--- dir.c	8 Dec 2004 21:23:03 -0000	1.22
***************
*** 514,518 ****
  						 && issrcfile(path)
  						 && infilelist(path) == NO) {
! 					  addsrcfile(path);
  					}
  				}
--- 514,519 ----
  						 && issrcfile(path)
  						 && infilelist(path) == NO) {
! 						if(access(path,R_OK) == 0)
! 							addsrcfile(path);
  					}
  				}

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24815

Modified Files:
	ChangeLog 
Log Message:
fixing srcfiles to only include readable files (sourceforge bug 1040690)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -r1.141 -r1.142
*** ChangeLog	6 Dec 2004 14:56:42 -0000	1.141
--- ChangeLog	8 Dec 2004 21:23:02 -0000	1.142
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-12-08  Neil Horman		   <nhorman@...>
+ 	* src/dir.c: Fix to dissallow unreadable files from 
+ 	srcfiles list (sourceforge bug number 1040690)
+ 
  2004-12-06  Neil Horman		   <nhorman@...>
  	* src/main.c: Fix for temp file security bug (sourceforge

Update of /cvsroot/cscope/cscope
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539

Modified Files:
	AUTHORS ChangeLog configure 
Log Message:
Fixing sourceforge bug 1062807

Index: AUTHORS
===================================================================
RCS file: /cvsroot/cscope/cscope/AUTHORS,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** AUTHORS	4 Sep 2003 17:15:34 -0000	1.32
--- AUTHORS	6 Dec 2004 14:56:42 -0000	1.33
***************
*** 32,33 ****
--- 32,34 ----
  David Cohrs - LEX and SUNOS scanner fix
  Valentin Podlovchenko - Overflow prevention and link recursion fix patch
+ Neil Horman <nhorman@...>  - Various Bug Fixes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cscope/cscope/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** ChangeLog	29 Nov 2004 12:50:21 -0000	1.140
--- ChangeLog	6 Dec 2004 14:56:42 -0000	1.141
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-12-06  Neil Horman		   <nhorman@...>
+ 	* src/main.c: Fix for temp file security bug (sourceforge 
+ 	bug number 1062807 / CAN-2004-0970)
+ 
  2004-11-22  Hans-Bernhard Broeker  <broeker@...>
  

Index: configure
===================================================================
RCS file: /cvsroot/cscope/cscope/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** configure	24 Feb 2004 15:13:20 -0000	1.24
--- configure	6 Dec 2004 14:56:42 -0000	1.25
***************
*** 1,7 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.58.
  #
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
--- 1,8 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
[...3486 lines suppressed...]
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
***************
*** 7606,7613 ****
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$as_dir" : 'X\(//\)[^/]' \| \
! 	 X"$as_dir" : 'X\(//\)$' \| \
! 	 X"$as_dir" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--- 7168,7175 ----
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
!          X"$as_dir" : 'X\(//\)[^/]' \| \
!          X"$as_dir" : 'X\(//\)$' \| \
!          X"$as_dir" : 'X\(/\)' \| \
!          .     : '\(.\)' 2>/dev/null ||
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

Update of /cvsroot/cscope/cscope/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1539/src

Modified Files:
	main.c 
Log Message:
Fixing sourceforge bug 1062807

Index: main.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** main.c	30 Apr 2004 15:31:43 -0000	1.33
--- main.c	6 Dec 2004 14:56:43 -0000	1.34
***************
*** 102,105 ****
--- 102,106 ----
  char	temp1[PATHLEN + 1];	/* temporary file name */
  char	temp2[PATHLEN + 1];	/* temporary file name */
+ char	tempdirpv[PATHLEN +1];	/* private temp directory */
  long	totalterms;		/* total inverted index terms */
  BOOL	trun_syms;		/* truncate symbols to 8 characters */
***************
*** 132,135 ****
--- 133,137 ----
  	pid_t	pid;
  	struct stat	stat_buf;
+ 	mode_t orig_umask;
  	
  	yyin = stdin;
***************
*** 331,337 ****
  
  	/* create the temporary file names */
  	pid = getpid();
! 	(void) sprintf(temp1, "%s/cscope%d.1", tmpdir, pid);
! 	(void) sprintf(temp2, "%s/cscope%d.2", tmpdir, pid);
  
  	/* if running in the foreground */
--- 333,348 ----
  
  	/* create the temporary file names */
+ 	orig_umask = umask(S_IRWXG|S_IRWXO);
  	pid = getpid();
! 	(void) sprintf(tempdirpv, "%s/cscope.%d", tmpdir, pid);
! 	if(mkdir(tempdirpv,S_IRWXU)) 
! 	{
! 		fprintf(stderr, "cscope: Could not create private temp dir %s\n",tempdirpv);
! 		myexit(1);
! 	}
! 	umask(orig_umask);
! 
! 	(void) sprintf(temp1, "%s/cscope.1", tempdirpv, pid);
! 	(void) sprintf(temp2, "%s/cscope.2", tempdirpv, pid);
  
  	/* if running in the foreground */
***************
*** 835,838 ****
--- 846,850 ----
  		(void) unlink(temp1);
  		(void) unlink(temp2);
+ 		(void) rmdir(tempdirpv);		
  	}
  	/* restore the terminal to its original mode */