[Cscope-cvs] CVS: cscope/src dir.c,1.23,1.24

[Hans-Bernhard B. <br...@us...>]

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

Modified Files:
	dir.c 
Log Message:
Work around Cygwin-1.5.19 silliness --- get rid of d_ino check altogether.

Index: dir.c
===================================================================
RCS file: /cvsroot/cscope/cscope/src/dir.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** dir.c	22 Nov 2005 11:28:55 -0000	1.23
--- dir.c	19 Apr 2006 14:28:57 -0000	1.24
***************
*** 99,104 ****
  	if (vpndirs > 1) {
  		nsrcdirs = vpndirs;
! 	}
! 	else {
  		nsrcdirs = 1;
  	}
--- 99,103 ----
  	if (vpndirs > 1) {
  		nsrcdirs = vpndirs;
! 	} else {
  		nsrcdirs = 1;
  	}
***************
*** 231,236 ****
  			incdirs = mymalloc(mincdirs * sizeof(char *));
  			incnames = mymalloc(mincdirs * sizeof(char *));
! 		}
! 		else if (nincdirs == mincdirs) {
  			mincdirs += DIRINC;
  			incdirs = myrealloc(incdirs, 
--- 230,234 ----
  			incdirs = mymalloc(mincdirs * sizeof(char *));
  			incnames = mymalloc(mincdirs * sizeof(char *));
! 		} else if (nincdirs == mincdirs) {
  			mincdirs += DIRINC;
  			incdirs = myrealloc(incdirs, 
***************
*** 285,290 ****
  				if ((s = inviewpath(file)) != NULL) {
  					addsrcfile(s);
! 				}
! 				else {
  					(void) fprintf(stderr, "cscope: cannot find file %s\n",
  						       file);
--- 283,287 ----
  				if ((s = inviewpath(file)) != NULL) {
  					addsrcfile(s);
! 				} else {
  					(void) fprintf(stderr, "cscope: cannot find file %s\n",
  						       file);
***************
*** 505,519 ****
                                              && S_ISDIR(buf.st_mode) ) {
  						scan_dir(path, recurse_dir);
! 					}
! 					else if (
! #ifdef __DJGPP__ /* FIXME: should test for feature, not platform */
! 						 1 /* DJGPP doesn't have this field in dirent */
! #else
! 						 entry->d_ino != 0
! #endif
! 						 && issrcfile(path)
! 						 && infilelist(path) == NO) {
! 						if(access(path,R_OK) == 0)
! 							addsrcfile(path);
  					}
  				}
--- 502,509 ----
                                              && S_ISDIR(buf.st_mode) ) {
  						scan_dir(path, recurse_dir);
! 					} else if (issrcfile(path)
! 						   && infilelist(path) == NO
! 						   && access(path, R_OK) == 0)
! 						addsrcfile(path);
  					}
  				}
***************
*** 607,612 ****
  	if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
  		addsrcfile(s);
! 	}
! 	else {
  		int file_len = strlen(file);
  
--- 597,601 ----
  	if (type[0] == '"' && (s = inviewpath(file)) != NULL) {
  		addsrcfile(s);
! 	} else {
  		int file_len = strlen(file);
  
***************
*** 712,719 ****
  			free (srcfiles[--nsrcfiles]);
  		}
! 	}
! 	else {
  		/* for '-d' option free the string space block */
! 	    if (nsrcfiles > 0)		/* protect against empty list */
  			free (srcfiles[0]);
  		nsrcfiles = 0;
--- 701,708 ----
  			free (srcfiles[--nsrcfiles]);
  		}
! 	} else {
  		/* for '-d' option free the string space block */
! 		/* protect against empty list */
! 		if (nsrcfiles > 0)
  			free (srcfiles[0]);
  		nsrcfiles = 0;