You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(2) |
Feb
(9) |
Mar
(6) |
Apr
(8) |
May
(7) |
Jun
(49) |
Jul
(36) |
Aug
(8) |
Sep
(4) |
Oct
(11) |
Nov
(3) |
Dec
|
2002 |
Jan
(8) |
Feb
|
Mar
(7) |
Apr
(2) |
May
|
Jun
(3) |
Jul
(9) |
Aug
(2) |
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
2003 |
Jan
(6) |
Feb
|
Mar
(2) |
Apr
(3) |
May
|
Jun
(5) |
Jul
|
Aug
(6) |
Sep
(6) |
Oct
(2) |
Nov
|
Dec
|
2004 |
Jan
(2) |
Feb
(12) |
Mar
|
Apr
(10) |
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(2) |
Dec
(4) |
2005 |
Jan
(4) |
Feb
(6) |
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
(2) |
Dec
|
2006 |
Jan
|
Feb
(2) |
Mar
|
Apr
(12) |
May
(2) |
Jun
|
Jul
(6) |
Aug
(4) |
Sep
(11) |
Oct
(10) |
Nov
|
Dec
|
2007 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2008 |
Jan
|
Feb
(2) |
Mar
(4) |
Apr
(2) |
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(2) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(8) |
2010 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2013 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(5) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
From: Hans-Bernhard B. <br...@us...> - 2006-04-21 10:42:23
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22955 Modified Files: input.c Log Message: Fix up curses display before askforreturn() finishes. Index: input.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/input.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** input.c 14 Mar 2005 17:24:46 -0000 1.13 --- input.c 21 Apr 2006 10:42:15 -0000 1.14 *************** *** 64,68 **** { (void) sig; /* 'use' it, to avoid a warning */ ! (void) signal(SIGINT, catchint); longjmp(env, 1); } --- 64,69 ---- { (void) sig; /* 'use' it, to avoid a warning */ ! ! signal(SIGINT, catchint); longjmp(env, 1); } *************** *** 79,240 **** mygetch(void) { ! sighandler_t savesig; /* old value of signal */ ! int c; ! /* change an interrupt signal to a break key character */ ! if (setjmp(env) == 0) { ! savesig = signal(SIGINT, catchint); ! refresh(); /* update the display */ ! mousereinit(); /* curses can change the menu number */ ! if(prevchar) { ! c = prevchar; ! prevchar = 0; ! } else { ! c = -1; ! while (c == -1) { ! /* get a character from the terminal */ ! c = getch(); ! if ((c == -1) && (errno != EINTR)) ! break; ! } ! } ! } else { /* longjmp to here from signal handler */ ! c = KEY_BREAK; } ! (void) signal(SIGINT, savesig); ! return(c); } - /* get a line from the terminal in non-canonical mode */ int mygetline(char p[], char s[], unsigned size, int firstchar, BOOL iscaseless) { ! int c, i = 0; ! int j; ! char *sright; /* substring to the right of the cursor */ ! int ri = 0; /* position in right-string */ ! ! /* Inserts and deletes are always performed on the left-string, ! * but we'll also have a right-string 'sright' to hold characters ! * which are on the right of the cursor [insertion point]. ! * ! * Think of 'sright' as a stack -- we push chars into it when the cursor ! * moves left, and we pop chars off it when the cursor moves right again. ! * At the end of the function, we'll pop off any remaining characters ! * onto the end of 's' ! */ ! sright = calloc(sizeof(char), size ); ! ! strcpy ( s, p); ! i += strlen(p); ! /* if a character already has been typed */ ! if (firstchar != '\0') { ! if(iscaseless == YES) { ! firstchar = tolower(firstchar); ! } ! addch(firstchar); /* display it */ ! s[i++] = firstchar; /* save it */ } ! /* until the end of the line is reached */ ! while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) { ! if (c == KEY_LEFT || c == ctrl('B')) { /* left */ ! if (i > 0) { ! addch('\b'); ! /* move this char into the second (rhs) string */ ! sright[ri++] = s[--i]; ! } ! } else if (c == KEY_RIGHT || c == ctrl('F')) { /* right */ ! if (i < size && ri > 0) { ! /* move this char to the left of the cursor */ ! s[i++] = sright[--ri]; ! addch(s[i-1]); ! } ! } else if ( ! #ifdef KEY_HOME ! c == KEY_HOME || ! #endif ! c == ctrl('A') ) { ! while (i > 0) { ! sright[ri++] = s[--i]; ! addch('\b'); ! addch(s[i]); ! addch('\b'); ! } ! } else if ( ! #ifdef KEY_END ! c == KEY_END || ! #endif ! c == ctrl('E') ) { ! while (ri > 0) { ! s[i++] = sright[--ri]; ! addch(s[i-1]); ! } ! } else if (c == erasechar() || c == KEY_BACKSPACE ! || c == DEL || c == ctrl('H') ) { ! /* erase */ ! if (i > 0) { ! if (ri == 0) { ! addstr("\b \b"); ! } else { ! addch('\b'); ! delch(); ! } ! s[i] = '\0'; ! --i; ! } ! } else if (c == killchar() || c == KEY_BREAK) { ! /* kill */ ! for (j = 0; j < i; ++j) { ! addch('\b'); ! } ! for (j = 0; j < i; ++j) { ! addch(' '); ! } ! for (j = 0; j < i; ++j) { ! addch('\b'); ! } ! i = 0; ! } else if (isprint(c) || c == '\t') { ! /* printable */ ! if(iscaseless == YES) { ! c = tolower(c); ! } ! /* if it will fit on the line */ ! if (i < size) { ! s[i++] = c; /* save it */ ! if (ri == 0) { ! addch(c); /* display it */ ! } else { ! insch(c); /* display it */ ! addch(c); /* advance cursor */ ! } ! } ! #if UNIXPC ! } else if (unixpcmouse == YES && c == ESC) { /* mouse */ ! getmouseaction(ESC); /* ignore it */ #endif ! } else if (mouse == YES && c == ctrl('X')) { ! getmouseaction(ctrl('X')); /* ignore it */ ! } else if (c == EOF) { /* end-of-file */ ! break; } ! ! /* return on an empty line to allow a command to be entered */ ! if (firstchar != '\0' && (i+ri) == 0) { ! break; } } ! /* move any remaining chars on the rhs of the cursor ! * onto the end of our string ! */ ! while (ri > 0) { ! s[i++] = sright[--ri]; } ! free(sright); ! s[i] = '\0'; ! return(i); } --- 80,241 ---- mygetch(void) { ! sighandler_t savesig; /* old value of signal */ ! int c; ! /* change an interrupt signal to a break key character */ ! if (setjmp(env) == 0) { ! savesig = signal(SIGINT, catchint); ! refresh(); /* update the display */ ! mousereinit(); /* curses can change the menu number */ ! if(prevchar) { ! c = prevchar; ! prevchar = 0; ! } else { ! c = -1; ! while (c == -1) { ! /* get a character from the terminal */ ! c = getch(); ! if ((c == -1) && (errno != EINTR)) ! break; ! } } ! } else { /* longjmp to here from signal handler */ ! c = KEY_BREAK; ! } ! signal(SIGINT, savesig); ! return(c); } + /* get a line from the terminal in non-canonical mode */ int mygetline(char p[], char s[], unsigned size, int firstchar, BOOL iscaseless) { ! int c; ! unsigned int i = 0, j; ! char *sright; /* substring to the right of the cursor */ ! unsigned int ri = 0; /* position in right-string */ ! ! /* Inserts and deletes are always performed on the left-string, ! * but we'll also have a right-string 'sright' to hold characters ! * which are on the right of the cursor [insertion point]. ! * ! * Think of 'sright' as a stack -- we push chars into it when the cursor ! * moves left, and we pop chars off it when the cursor moves right again. ! * At the end of the function, we'll pop off any remaining characters ! * onto the end of 's' ! */ ! sright = calloc(sizeof(char), size ); ! ! strcpy ( s, p); ! i += strlen(p); ! /* if a character already has been typed */ ! if (firstchar != '\0') { ! if(iscaseless == YES) { ! firstchar = tolower(firstchar); } ! addch(firstchar); /* display it */ ! s[i++] = firstchar; /* save it */ ! } ! /* until the end of the line is reached */ ! while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) { ! if (c == KEY_LEFT || c == ctrl('B')) { /* left */ ! if (i > 0) { ! addch('\b'); ! /* move this char into the second (rhs) string */ ! sright[ri++] = s[--i]; ! } ! } else if (c == KEY_RIGHT || c == ctrl('F')) { /* right */ ! if (i < size && ri > 0) { ! /* move this char to the left of the cursor */ ! s[i++] = sright[--ri]; ! addch(s[i-1]); ! } ! } else if ( ! #ifdef KEY_HOME ! c == KEY_HOME || #endif ! c == ctrl('A') ) { ! while (i > 0) { ! sright[ri++] = s[--i]; ! addch('\b'); ! addch(s[i]); ! addch('\b'); ! } ! } else if ( ! #ifdef KEY_END ! c == KEY_END || ! #endif ! c == ctrl('E') ) { ! while (ri > 0) { ! s[i++] = sright[--ri]; ! addch(s[i-1]); ! } ! } else if (c == erasechar() || c == KEY_BACKSPACE ! || c == DEL || c == ctrl('H') ) { ! /* erase */ ! if (i > 0) { ! if (ri == 0) { ! addstr("\b \b"); ! } else { ! addch('\b'); ! delch(); } ! s[i] = '\0'; ! --i; ! } ! } else if (c == killchar() || c == KEY_BREAK) { ! /* kill */ ! for (j = 0; j < i; ++j) { ! addch('\b'); ! } ! for (j = 0; j < i; ++j) { ! addch(' '); ! } ! for (j = 0; j < i; ++j) { ! addch('\b'); ! } ! i = 0; ! } else if (isprint(c) || c == '\t') { ! /* printable */ ! if(iscaseless == YES) { ! c = tolower(c); ! } ! /* if it will fit on the line */ ! if (i < size) { ! s[i++] = c; /* save it */ ! if (ri == 0) { ! addch(c); /* display it */ ! } else { ! insch(c); /* display it */ ! addch(c); /* advance cursor */ } + } + #if UNIXPC + } else if (unixpcmouse == YES && c == ESC) { /* mouse */ + getmouseaction(ESC); /* ignore it */ + #endif + } else if (mouse == YES && c == ctrl('X')) { + getmouseaction(ctrl('X')); /* ignore it */ + } else if (c == EOF) { /* end-of-file */ + break; } ! /* return on an empty line to allow a command to be entered */ ! if (firstchar != '\0' && (i+ri) == 0) { ! break; } ! } ! ! /* move any remaining chars on the rhs of the cursor ! * onto the end of our string ! */ ! while (ri > 0) { ! s[i++] = sright[--ri]; ! } ! free(sright); ! s[i] = '\0'; ! return(i); } *************** *** 244,249 **** askforchar(void) { ! addstr("Type any character to continue: "); ! (void) mygetch(); } --- 245,250 ---- askforchar(void) { ! addstr("Type any character to continue: "); ! mygetch(); } *************** *** 253,258 **** askforreturn(void) { ! (void) fprintf(stderr, "Press the RETURN key to continue: "); ! (void) getchar(); } --- 254,263 ---- askforreturn(void) { ! fprintf(stderr, "Press the RETURN key to continue: "); ! getchar(); ! /* HBB 20060419: message probably messed up the screen --- redraw */ ! if (incurses == YES) { ! redrawwin(curscr); ! } } *************** *** 262,330 **** shellpath(char *out, int limit, char *in) { ! char *lastchar; ! char *s, *v; ! ! /* skip leading white space */ ! while (isspace((unsigned char)*in)) { ! ++in; ! } ! lastchar = out + limit - 1; ! ! /* a tilde (~) by itself represents $HOME; followed by a name it ! represents the $LOGDIR of that login name */ ! if (*in == '~') { ! *out++ = *in++; /* copy the ~ because it may not be expanded */ ! ! /* get the login name */ ! s = out; ! while (s < lastchar && *in != '/' && *in != '\0' && !isspace((unsigned char)*in)) { ! *s++ = *in++; ! } ! *s = '\0'; ! /* if the login name is null, then use $HOME */ ! if (*out == '\0') { ! v = getenv("HOME"); ! } ! else { /* get the home directory of the login name */ ! v = logdir(out); ! } ! /* copy the directory name */ ! if (v != NULL) { ! (void) strcpy(out - 1, v); ! out += strlen(v) - 1; ! } ! else { /* login not found, so ~ must be part of the file name */ ! out += strlen(out); ! } } ! /* get the rest of the path */ ! while (out < lastchar && *in != '\0' && !isspace((unsigned char)*in)) { ! /* look for an environment variable */ ! if (*in == '$') { ! *out++ = *in++; /* copy the $ because it may not be expanded */ ! ! /* get the variable name */ ! s = out; ! while (s < lastchar && *in != '/' && *in != '\0' && ! !isspace((unsigned char)*in)) { ! *s++ = *in++; ! } ! *s = '\0'; ! /* get its value */ ! if ((v = getenv(out)) != NULL) { ! (void) strcpy(out - 1, v); ! out += strlen(v) - 1; ! } ! else { /* var not found, so $ must be part of the file name */ ! out += strlen(out); ! } ! } ! else { /* ordinary character */ ! *out++ = *in++; ! } } ! *out = '\0'; } --- 267,335 ---- shellpath(char *out, int limit, char *in) { ! char *lastchar; ! char *s, *v; ! /* skip leading white space */ ! while (isspace((unsigned char)*in)) { ! ++in; ! } ! lastchar = out + limit - 1; ! ! /* a tilde (~) by itself represents $HOME; followed by a name it ! represents the $LOGDIR of that login name */ ! if (*in == '~') { ! *out++ = *in++; /* copy the ~ because it may not be expanded */ ! ! /* get the login name */ ! s = out; ! while (s < lastchar && *in != '/' && *in != '\0' && !isspace((unsigned char)*in)) { ! *s++ = *in++; } ! *s = '\0'; ! /* if the login name is null, then use $HOME */ ! if (*out == '\0') { ! v = getenv("HOME"); ! } ! else { /* get the home directory of the login name */ ! v = logdir(out); ! } ! /* copy the directory name */ ! if (v != NULL) { ! strcpy(out - 1, v); ! out += strlen(v) - 1; ! } ! else { /* login not found, so ~ must be part of the file name */ ! out += strlen(out); ! } ! } ! /* get the rest of the path */ ! while (out < lastchar && *in != '\0' && !isspace((unsigned char)*in)) { ! ! /* look for an environment variable */ ! if (*in == '$') { ! *out++ = *in++; /* copy the $ because it may not be expanded */ ! ! /* get the variable name */ ! s = out; ! while (s < lastchar && *in != '/' && *in != '\0' && ! !isspace((unsigned char)*in)) { ! *s++ = *in++; ! } ! *s = '\0'; ! /* get its value */ ! if ((v = getenv(out)) != NULL) { ! strcpy(out - 1, v); ! out += strlen(v) - 1; ! } ! else { /* var not found, so $ must be part of the file name */ ! out += strlen(out); ! } ! } ! else { /* ordinary character */ ! *out++ = *in++; } ! } ! *out = '\0'; } |
From: Hans-Bernhard B. <br...@us...> - 2006-04-21 10:41:28
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22336 Modified Files: config.h.in configure configure.in Log Message: #include <io.h> for setmode() prototype, if platform has it. Index: config.h.in =================================================================== RCS file: /cvsroot/cscope/cscope/config.h.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** config.h.in 24 Feb 2004 15:13:20 -0000 1.17 --- config.h.in 21 Apr 2006 10:41:21 -0000 1.18 *************** *** 26,29 **** --- 26,32 ---- #undef HAVE_INTTYPES_H + /* Define to 1 if you have the <io.h> header file. */ + #undef HAVE_IO_H + /* Define to 1 if you have the `regex' library (-lregex). */ #undef HAVE_LIBREGEX Index: configure =================================================================== RCS file: /cvsroot/cscope/cscope/configure,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** configure 19 Apr 2006 14:30:16 -0000 1.26 --- configure 21 Apr 2006 10:41:21 -0000 1.27 *************** *** 5128,5132 **** ! for ac_header in fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --- 5128,5133 ---- ! ! for ac_header in fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h io.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` Index: configure.in =================================================================== RCS file: /cvsroot/cscope/cscope/configure.in,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** configure.in 24 Feb 2004 15:13:21 -0000 1.31 --- configure.in 21 Apr 2006 10:41:21 -0000 1.32 *************** *** 382,386 **** AC_HEADER_DIRENT AC_HEADER_STDC ! AC_CHECK_HEADERS(fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h) dnl Checks for typedefs, structures, and compiler characteristics. --- 382,386 ---- AC_HEADER_DIRENT AC_HEADER_STDC ! AC_CHECK_HEADERS(fcntl.h sys/window.h sys/termios.h unistd.h signal.h floss.h io.h) dnl Checks for typedefs, structures, and compiler characteristics. |
From: Hans-Bernhard B. <br...@us...> - 2006-04-21 10:40:46
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21961 Modified Files: mypopen.c Log Message: #include <io.h> for setmode() prototype, if platform has it. Index: mypopen.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/mypopen.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** mypopen.c 30 Jan 2005 19:33:28 -0000 1.13 --- mypopen.c 21 Apr 2006 10:40:29 -0000 1.14 *************** *** 49,52 **** --- 49,56 ---- #endif + #ifdef HAVE_IO_H + # include <io.h> /* for setmode() */ + #endif + static char const rcsid[] = "$Id$"; *************** *** 57,95 **** myopen(char *path, int flag, int mode) { ! /* opens a file descriptor and then sets close-on-exec for the file */ ! int fd; ! /* 20020103: if file is not explicitly in Binary mode, make ! * sure we override silly Cygwin behaviour of automatic binary ! * mode for files in "binary mounted" paths */ #if O_BINARY != O_TEXT ! if (! (flag | O_BINARY)) ! flag |= O_TEXT; #endif ! if(mode) ! fd = open(path, flag, mode); ! else ! fd = open(path, flag); #ifdef __DJGPP__ /* FIXME: test feature, not platform */ ! /* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it ! * always fails this call. Have to skip that step */ ! if(fd != -1) ! return(fd); #endif ! if(fd != -1 && (fcntl(fd, F_SETFD, CLOSE_ON_EXEC) != -1)) ! return(fd); ! else { ! /* Ensure that if the fcntl fails and fd is valid, then ! the file is closed properly. In general this should ! not happen. */ ! if (fd != -1) { ! close (fd); } ! return(-1); } } --- 61,99 ---- myopen(char *path, int flag, int mode) { ! /* opens a file descriptor and then sets close-on-exec for the file */ ! int fd; ! /* 20020103: if file is not explicitly in Binary mode, make ! * sure we override silly Cygwin behaviour of automatic binary ! * mode for files in "binary mounted" paths */ #if O_BINARY != O_TEXT ! if (! (flag | O_BINARY)) ! flag |= O_TEXT; #endif ! if(mode) ! fd = open(path, flag, mode); ! else ! fd = open(path, flag); #ifdef __DJGPP__ /* FIXME: test feature, not platform */ ! /* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it ! * always fails this call. Have to skip that step */ ! if(fd != -1) ! return(fd); #endif ! if(fd != -1 && (fcntl(fd, F_SETFD, CLOSE_ON_EXEC) != -1)) ! return(fd); ! else { ! /* Ensure that if the fcntl fails and fd is valid, then ! the file is closed properly. In general this should ! not happen. */ ! if (fd != -1) { ! close (fd); } ! return(-1); } } *************** *** 98,123 **** myfopen(char *path, char *mode) { ! /* opens a file pointer and then sets close-on-exec for the file */ ! FILE *fp; ! fp = fopen(path, mode); #ifdef SETMODE ! if (fp && ! strchr(mode, 'b')) { ! SETMODE(fileno(fp), O_TEXT); ! } #endif /* SETMODE */ #ifdef __DJGPP__ /* FIXME: test feature, not platform */ ! /* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it ! * always fails this call. Have to skip that step */ ! if(fp) #else if(fp && (fcntl(fileno(fp), F_SETFD, CLOSE_ON_EXEC) != -1)) #endif ! return(fp); else ! return(NULL); } --- 102,127 ---- myfopen(char *path, char *mode) { ! /* opens a file pointer and then sets close-on-exec for the file */ ! FILE *fp; ! fp = fopen(path, mode); #ifdef SETMODE ! if (fp && ! strchr(mode, 'b')) { ! SETMODE(fileno(fp), O_TEXT); ! } #endif /* SETMODE */ #ifdef __DJGPP__ /* FIXME: test feature, not platform */ ! /* HBB 20010312: DOS GCC doesn't have FD_CLOEXEC (yet), so it ! * always fails this call. Have to skip that step */ ! if(fp) #else if(fp && (fcntl(fileno(fp), F_SETFD, CLOSE_ON_EXEC) != -1)) #endif ! return(fp); else ! return(NULL); } |
From: Hans-Bernhard B. <br...@us...> - 2006-04-19 15:20:28
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5158 Modified Files: dir.c Log Message: Fix silly ooops from editing out d_ino test... Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** dir.c 19 Apr 2006 14:28:57 -0000 1.24 --- dir.c 19 Apr 2006 15:20:21 -0000 1.25 *************** *** 504,508 **** } else if (issrcfile(path) && infilelist(path) == NO ! && access(path, R_OK) == 0) addsrcfile(path); } --- 504,508 ---- } else if (issrcfile(path) && infilelist(path) == NO ! && access(path, R_OK) == 0) { addsrcfile(path); } |
From: Hans-Bernhard B. <br...@us...> - 2006-04-19 14:30:23
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276 Modified Files: ChangeLog Makefile.in aclocal.m4 configure Log Message: Autoreconf'ed to versions 2.59 / 1.9.6 Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -r1.154 -r1.155 *** ChangeLog 21 Feb 2006 19:54:56 -0000 1.154 --- ChangeLog 19 Apr 2006 14:30:16 -0000 1.155 *************** *** 1,2 **** --- 1,13 ---- + 2006-04-19 Hans-Bernhard Broeker <br...@ph...> + + * src/dir.c (scan_dir): Get rid of d_ino check --- this field is + not reliably present in struct dirent, and doesn't achieve enough + to be worth autoconf-ing around. Works around problems compiling on + Cygwin release 1.5.19. + + * Makefile.in, aclocal.m4, configure, contrib/Makefile.in, + doc/Makefile.in, src/Makefile.in: Regenerated with current auto + tools (autoconf-2.59, automake 1.9.6). + 2006-02-21 Hans-Bernhard Broeker <br...@ph...> Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile.in 12 Feb 2004 18:14:04 -0000 1.7 --- Makefile.in 19 Apr 2006 14:30:16 -0000 1.8 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,18 **** @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 14,17 ---- *************** *** 22,26 **** pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ --- 21,24 ---- *************** *** 36,40 **** --- 34,77 ---- PRE_UNINSTALL = : POST_UNINSTALL = : + build_triplet = @build@ host_triplet = @host@ + LIBOBJDIR = + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + TODO compile config.guess config.sub depcomp install-sh \ + missing mkinstalldirs ylwrap + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print + distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ *************** *** 102,105 **** --- 139,144 ---- am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ bindir = @bindir@ build = @build@ *************** *** 124,127 **** --- 163,167 ---- localstatedir = @localstatedir@ mandir = @mandir@ + mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ *************** *** 131,174 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ - SUBDIRS = doc src contrib - EXTRA_DIST = packages - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - - RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive - DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \ - COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \ - compile config.guess config.h.in config.sub configure \ - configure.in depcomp install-sh missing mkinstalldirs ylwrap - DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! ! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ! configure.lineno ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck - $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) --- 171,212 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = doc src contrib EXTRA_DIST = packages all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! am--refresh: ! @: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ! cd $(srcdir) && $(AUTOMAKE) --gnu \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! echo ' $(SHELL) ./config.status'; \ ! $(SHELL) ./config.status;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ! esac; ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) *************** *** 182,189 **** @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h ! ! $(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) ! touch $(srcdir)/config.h.in distclean-hdr: --- 220,227 ---- @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h ! $(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) ! rm -f stamp-h1 ! touch $@ distclean-hdr: *************** *** 198,202 **** # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ --- 236,246 ---- # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 210,214 **** fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done; \ if test "$$dot_seen" = "no"; then \ --- 254,258 ---- fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ *************** *** 218,222 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ --- 262,272 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ dot_seen=no; \ case "$@" in \ *************** *** 239,243 **** fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: --- 289,293 ---- fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ done && test -z "$$fail" tags-recursive: *************** *** 250,261 **** done - ETAGS = etags - ETAGSFLAGS = - - CTAGS = ctags - CTAGSFLAGS = - - tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ --- 300,303 ---- *************** *** 266,269 **** --- 308,312 ---- END { for (i in files) print i; }'`; \ mkid -fID $$unique + tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ *************** *** 271,282 **** tags=; \ here=`pwd`; \ ! if (etags --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ else \ include_option=--include; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -f $$subdir/TAGS && \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ --- 314,327 ---- tags=; \ here=`pwd`; \ ! if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ *************** *** 288,295 **** $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ --- 333,341 ---- $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ! test -n "$$unique" || unique=$$empty_fix; \ ! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique; \ ! fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ *************** *** 314,330 **** distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = . - distdir = $(PACKAGE)-$(VERSION) - - am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) --- 360,363 ---- *************** *** 342,346 **** if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ --- 375,379 ---- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 357,369 **** fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -d $(distdir)/$$subdir \ ! || mkdir $(distdir)/$$subdir \ || exit 1; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ distdir) \ || exit 1; \ --- 390,404 ---- fi; \ done ! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ ! test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$$top_distdir" \ ! distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ *************** *** 376,384 **** || chmod -R a+r $(distdir) dist-gzip: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) --- 411,436 ---- || chmod -R a+r $(distdir) dist-gzip: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! dist-bzip2: distdir ! tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ! $(am__remove_distdir) ! ! dist-tarZ: distdir ! tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ! $(am__remove_distdir) ! ! dist-shar: distdir ! shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ! $(am__remove_distdir) ! ! dist-zip: distdir ! -rm -f $(distdir).zip ! zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) *************** *** 387,392 **** # tarfile. distcheck: dist ! $(am__remove_distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build --- 439,454 ---- # tarfile. distcheck: dist ! case '$(DIST_ARCHIVES)' in \ ! *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ! *.tar.bz2*) \ ! bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ! *.tar.Z*) \ ! uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ! *.shar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ! *.zip*) \ ! unzip $(distdir).zip ;;\ ! esac chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build *************** *** 408,412 **** && chmod -R a-w "$$dc_install_base" \ && ({ \ ! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ --- 470,474 ---- && chmod -R a-w "$$dc_install_base" \ && ({ \ ! (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ *************** *** 415,424 **** } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ ! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ! && rm -f $(distdir).tar.gz \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ --- 477,487 ---- } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) ! @(echo "$(distdir) archives ready for distribution: "; \ ! list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ! sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ *************** *** 444,448 **** installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive --- 507,510 ---- *************** *** 464,468 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 526,530 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 482,485 **** --- 544,549 ---- dvi-am: + html: html-recursive + info: info-recursive *************** *** 518,537 **** uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-recursive ctags ctags-recursive dist \ ! dist-all dist-gzip distcheck distclean distclean-generic \ ! distclean-hdr distclean-recursive distclean-tags distcleancheck \ ! distdir distuninstallcheck dvi dvi-am dvi-recursive info \ ! info-am info-recursive install install-am install-data \ ! install-data-am install-data-recursive install-exec \ ! install-exec-am install-exec-recursive install-info \ ! install-info-am install-info-recursive install-man \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-generic \ ! mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ ! ps-recursive tags tags-recursive uninstall uninstall-am \ ! uninstall-info-am uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 582,599 ---- uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ ! check-am clean clean-generic clean-recursive ctags \ ! ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ ! dist-tarZ dist-zip distcheck distclean distclean-generic \ ! distclean-hdr distclean-recursive distclean-tags \ ! distcleancheck distdir distuninstallcheck dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-strip installcheck \ ! installcheck-am installdirs installdirs-am maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive \ ! mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ ! pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/cscope/cscope/aclocal.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** aclocal.m4 12 Feb 2004 18:14:04 -0000 1.5 --- aclocal.m4 19 Apr 2006 14:30:16 -0000 1.6 *************** *** 1,6 **** ! # generated automatically by aclocal 1.7.9 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,6 ---- ! # generated automatically by aclocal 1.9.6 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, [...1266 lines suppressed...] ! ! # tar/untar a dummy directory, and stop if the command works ! rm -rf conftest.dir ! mkdir conftest.dir ! echo GrepMe > conftest.dir/file ! AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ! rm -rf conftest.dir ! if test -s conftest.tar; then ! AM_RUN_LOG([$am__untar <conftest.tar]) ! grep GrepMe conftest.dir/file >/dev/null 2>&1 && break ! fi ! done ! rm -rf conftest.dir ! ! AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ! AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ! AC_SUBST([am__tar]) ! AC_SUBST([am__untar]) ! ]) # _AM_PROG_TAR Index: configure =================================================================== RCS file: /cvsroot/cscope/cscope/configure,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** configure 6 Dec 2004 14:56:42 -0000 1.25 --- configure 19 Apr 2006 14:30:16 -0000 1.26 *************** *** 1,8 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # ! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. --- 1,7 ---- #! /bin/sh [...3742 lines suppressed...] 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; } --- 7656,7663 ---- 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; } |
From: Hans-Bernhard B. <br...@us...> - 2006-04-19 14:30:23
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276/src Modified Files: Makefile.in Log Message: Autoreconf'ed to versions 2.59 / 1.9.6 Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/src/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.in 12 Feb 2004 18:14:05 -0000 1.10 --- Makefile.in 19 Apr 2006 14:30:16 -0000 1.11 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ [...1626 lines suppressed...] .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic ctags distclean distclean-compile \ ! distclean-generic distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-binPROGRAMS install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ --- 956,965 ---- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic ctags dist-hook distclean distclean-compile \ ! distclean-generic distclean-tags distdir dvi dvi-am html \ ! html-am info info-am install install-am install-binPROGRAMS \ ! install-data install-data-am install-exec install-exec-am \ ! install-info install-info-am install-man install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ |
From: Hans-Bernhard B. <br...@us...> - 2006-04-19 14:30:22
|
Update of /cvsroot/cscope/cscope/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276/contrib Modified Files: Makefile.in Log Message: Autoreconf'ed to versions 2.59 / 1.9.6 Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/contrib/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile.in 12 Feb 2004 18:14:05 -0000 1.7 --- Makefile.in 19 Apr 2006 14:30:16 -0000 1.8 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 22,26 **** pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ --- 22,25 ---- *************** *** 36,40 **** --- 35,56 ---- PRE_UNINSTALL = : POST_UNINSTALL = : + build_triplet = @build@ host_triplet = @host@ + LIBOBJDIR = + subdir = contrib + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ *************** *** 102,105 **** --- 118,123 ---- am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ bindir = @bindir@ build = @build@ *************** *** 124,127 **** --- 142,146 ---- localstatedir = @localstatedir@ mandir = @mandir@ + mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ *************** *** 131,165 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ - bin_SCRIPTS = ocs - EXTRA_DIST = ocs README xcscope webcscope - subdir = contrib - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - SCRIPTS = $(bin_SCRIPTS) - - DIST_SOURCES = - DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu contrib/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! binSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ ! $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done --- 150,196 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ bin_SCRIPTS = ocs EXTRA_DIST = ocs README xcscope webcscope all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu contrib/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) ! test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ! $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ else :; fi; \ done *************** *** 169,174 **** @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done uninstall-info-am: --- 200,205 ---- @list='$(bin_SCRIPTS)'; for p in $$list; do \ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ! rm -f "$(DESTDIR)$(bindir)/$$f"; \ done uninstall-info-am: *************** *** 179,186 **** CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) --- 210,213 ---- *************** *** 196,200 **** if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ --- 223,227 ---- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 214,220 **** check: check-am all-am: Makefile $(SCRIPTS) - installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am install-exec: install-exec-am --- 241,248 ---- check: check-am all-am: Makefile $(SCRIPTS) installdirs: ! for dir in "$(DESTDIR)$(bindir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am *************** *** 236,240 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 264,268 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 253,256 **** --- 281,286 ---- dvi-am: + html: html-am + info: info-am *************** *** 286,296 **** .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am info info-am install \ ! install-am install-binSCRIPTS install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ ! uninstall-am uninstall-binSCRIPTS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 316,327 ---- .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am html html-am info info-am \ ! install install-am install-binSCRIPTS install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-man install-strip installcheck \ ! installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ! pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS \ ! uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. |
From: Hans-Bernhard B. <br...@us...> - 2006-04-19 14:30:22
|
Update of /cvsroot/cscope/cscope/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276/doc Modified Files: Makefile.in Log Message: Autoreconf'ed to versions 2.59 / 1.9.6 Index: Makefile.in =================================================================== RCS file: /cvsroot/cscope/cscope/doc/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Makefile.in 12 Feb 2004 18:14:05 -0000 1.6 --- Makefile.in 19 Apr 2006 14:30:16 -0000 1.7 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 14,18 **** @SET_MAKE@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 14,17 ---- *************** *** 22,26 **** pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ --- 21,24 ---- *************** *** 36,40 **** --- 34,56 ---- PRE_UNINSTALL = : POST_UNINSTALL = : + build_triplet = @build@ host_triplet = @host@ + LIBOBJDIR = + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + SOURCES = + DIST_SOURCES = + man1dir = $(mandir)/man1 + am__installdirs = "$(DESTDIR)$(man1dir)" + NROFF = nroff + MANS = $(man_MANS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ *************** *** 102,105 **** --- 118,123 ---- am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ + am__tar = @am__tar@ + am__untar = @am__untar@ bindir = @bindir@ build = @build@ *************** *** 124,127 **** --- 142,146 ---- localstatedir = @localstatedir@ mandir = @mandir@ + mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ *************** *** 131,161 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ - man_MANS = cscope.1 EXTRA_DIST = $(man_MANS) - subdir = doc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - DIST_SOURCES = - - NROFF = nroff - MANS = $(man_MANS) - DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) uninstall-info-am: - - man1dir = $(mandir)/man1 install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(man1dir) @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ --- 150,191 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = cscope.1 EXTRA_DIST = $(man_MANS) all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: install-man1: $(man1_MANS) $(man_MANS) @$(NORMAL_INSTALL) ! test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ *************** *** 176,181 **** inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ ! $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ done uninstall-man1: --- 206,211 ---- inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ! $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ done uninstall-man1: *************** *** 197,202 **** inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ ! rm -f $(DESTDIR)$(man1dir)/$$inst; \ done tags: TAGS --- 227,232 ---- inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ! echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ ! rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done tags: TAGS *************** *** 206,213 **** CTAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - - top_distdir = .. - distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) --- 236,239 ---- *************** *** 223,227 **** if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ else \ dir=''; \ --- 249,253 ---- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ *************** *** 241,247 **** check: check-am all-am: Makefile $(MANS) - installdirs: ! $(mkinstalldirs) $(DESTDIR)$(man1dir) install: install-am install-exec: install-exec-am --- 267,274 ---- check: check-am all-am: Makefile $(MANS) installdirs: ! for dir in "$(DESTDIR)$(man1dir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done install: install-am install-exec: install-exec-am *************** *** 263,267 **** distclean-generic: ! -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: --- 290,294 ---- distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: *************** *** 280,283 **** --- 307,312 ---- dvi-am: + html: html-am + info: info-am *************** *** 315,320 **** .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-man1 install-strip installcheck installcheck-am \ --- 344,349 ---- .PHONY: all all-am check check-am clean clean-generic distclean \ ! distclean-generic distdir dvi dvi-am html html-am info info-am \ ! install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-man1 install-strip installcheck installcheck-am \ |
From: Hans-Bernhard B. <br...@us...> - 2006-04-19 14:29:10
|
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; |
From: Hans-Bernhard B. <br...@us...> - 2006-02-21 19:55:04
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2604/src Modified Files: vpinit.c Log Message: Fix handling of slightly malformed VPATH contents. Index: vpinit.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/vpinit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vpinit.c 30 Apr 2004 15:30:51 -0000 1.6 --- vpinit.c 21 Feb 2006 19:54:57 -0000 1.7 *************** *** 100,104 **** vpndirs = 1; for (i = 0; vpath[i] != '\0'; ++i) { ! if (vpath[i] == ':') { ++vpndirs; } --- 100,104 ---- vpndirs = 1; for (i = 0; vpath[i] != '\0'; ++i) { ! if (vpath[i] == ':' && vpath[i + 1]) { ++vpndirs; } |
From: Hans-Bernhard B. <br...@us...> - 2006-02-21 19:55:01
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2604 Modified Files: ChangeLog Log Message: Fix handling of slightly malformed VPATH contents. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -r1.153 -r1.154 *** ChangeLog 22 Nov 2005 11:28:54 -0000 1.153 --- ChangeLog 21 Feb 2006 19:54:56 -0000 1.154 *************** *** 1,2 **** --- 1,7 ---- + 2006-02-21 Hans-Bernhard Broeker <br...@ph...> + + * src/vpinit.c (vpinit): Fix handling of slightly malformed VPATH + environment variable contents. + 2005-11-22 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2005-11-22 11:29:04
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8544/src Modified Files: dir.c invlib.c Log Message: Find C++ with three-letter filename extensions. Fix a bug in inverted index handling on 64-bit platforms. Index: dir.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/dir.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** dir.c 8 Dec 2004 21:23:03 -0000 1.22 --- dir.c 22 Nov 2005 11:28:55 -0000 1.23 *************** *** 533,536 **** --- 533,537 ---- char *file = mybasename(path); char *s = strrchr(file, '.'); + BOOL looks_like_source = NO; /* ensure there is some file suffix */ *************** *** 557,561 **** case 'H': case 'L': ! return(YES); } } else if ((s[2] == '\0') /* 2 char suffix */ --- 558,562 ---- case 'H': case 'L': ! looks_like_source = YES; } } else if ((s[2] == '\0') /* 2 char suffix */ *************** *** 566,585 **** || (s[0] == 'c' && s[1] == 'c') /* C++ source */ || (s[0] == 'h' && s[1] == 'h'))) { /* C++ header */ - /* some directories have 2 character - suffixes so make sure it is a file */ - if (lstat(path, &statstruct) == 0 && - S_ISREG(statstruct.st_mode)) { - return(YES); - } } else if((s[3] == '\0') /* 3 char suffix */ /* C++ template source */ ! && (s[0] == 't' && s[1] == 'c' && s[2] == 'c' ) ! ) { ! /* make sure it is a file */ ! if (lstat(path, &statstruct) == 0 && ! S_ISREG(statstruct.st_mode)) { ! return(YES); ! } } return NO; --- 567,589 ---- || (s[0] == 'c' && s[1] == 'c') /* C++ source */ || (s[0] == 'h' && s[1] == 'h'))) { /* C++ header */ + looks_like_source = YES; } else if((s[3] == '\0') /* 3 char suffix */ /* C++ template source */ ! && ((s[0] == 't' && s[1] == 'c' && s[2] == 'c' ) ! /* C++ source: */ ! || (s[0] == 'c' && s[1] == 'p' && s[2] == 'p' ) ! || (s[0] == 'c' && s[1] == 'x' && s[2] == 'x' )) ! ) { ! looks_like_source = YES; ! } ! ! if (looks_like_source != YES) ! return NO; ! ! /* make sure it is a file */ ! if (lstat(path, &statstruct) == 0 && ! S_ISREG(statstruct.st_mode)) { ! return(YES); } return NO; Index: invlib.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/invlib.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** invlib.c 13 Aug 2001 15:31:22 -0000 1.15 --- invlib.c 22 Nov 2005 11:28:55 -0000 1.16 *************** *** 128,132 **** } indexfile = invname; ! (void) fseek(outfile, (long) BUFSIZ, 0); /* posting file */ --- 128,132 ---- } indexfile = invname; ! fseek(outfile, BUFSIZ, SEEK_SET); /* posting file */ *************** *** 159,163 **** supint++; /* leave first term open for a count */ /* initialize using an empty term */ ! (void) strcpy(thisterm, ""); *supint++ = 0; *supfing++ = ' '; --- 159,163 ---- supint++; /* leave first term open for a count */ /* initialize using an empty term */ ! strcpy(thisterm, ""); *supint++ = 0; *supfing++ = ' '; *************** *** 195,200 **** #endif #if DEBUG ! (void) printf("%ld: %s ", totpost, line); ! (void) fflush(stdout); #endif if (strcmp(thisterm, line) == 0) { --- 195,200 ---- #endif #if DEBUG ! printf("%ld: %s ", totpost, line); ! fflush(stdout); #endif if (strcmp(thisterm, line) == 0) { *************** *** 208,213 **** postptr = i + POST; #if DEBUG ! (void) printf("reallocated post space to %u, totpost=%ld\n", ! postsize, totpost); #endif } --- 208,213 ---- postptr = i + POST; #if DEBUG ! printf("reallocated post space to %u, totpost=%ld\n", ! postsize, totpost); #endif } *************** *** 218,222 **** return(0); } ! (void) strcpy(thisterm, line); numpost = 1; postptr = POST; --- 218,222 ---- return(0); } ! strcpy(thisterm, line); numpost = 1; postptr = POST; *************** *** 248,254 **** *postptr++ = posting; #if DEBUG ! (void) printf("%ld %ld %ld %ld\n", posting.fileindex, ! posting.fcnoffset, posting.lineoffset, posting.type); ! (void) fflush(stdout); #endif } --- 248,254 ---- *postptr++ = posting; #if DEBUG ! printf("%ld %ld %ld %ld\n", posting.fileindex, ! posting.fcnoffset, posting.lineoffset, posting.type); ! fflush(stdout); #endif } *************** *** 313,317 **** goto cannotwrite; } ! (void) fseek(outfile, (long)BUFSIZ + 8, 0); /* get to second word first block */ tlong = numlogblk - 1; if (fwrite(&tlong, sizeof(tlong), 1, outfile) == 0 || --- 313,318 ---- goto cannotwrite; } ! /* get to second word first block */ ! fseek(outfile, BUFSIZ + 2 * sizeof(long), SEEK_SET); tlong = numlogblk - 1; if (fwrite(&tlong, sizeof(tlong), 1, outfile) == 0 || *************** *** 327,342 **** --totterm; /* don't count null term */ #if STATS ! (void) printf("logical blocks = %d, postings = %ld, terms = %ld, max term length = %d\n", numlogblk, totpost, totterm, maxtermlen); if (showzipf) { ! (void) printf("\n************* ZIPF curve ****************\n"); for (j = ZIPFSIZE; j > 1; j--) if (zipf[j]) break; for (i = 1; i < j; ++i) { ! (void) printf("%3d -%6d ", i, zipf[i]); ! if (i % 6 == 0) (void) putchar('\n'); } ! (void) printf(">%d-%6d\n", ZIPFSIZE, zipf[0]); } #endif --- 328,343 ---- --totterm; /* don't count null term */ #if STATS ! printf("logical blocks = %d, postings = %ld, terms = %ld, max term length = %d\n", numlogblk, totpost, totterm, maxtermlen); if (showzipf) { ! printf("\n************* ZIPF curve ****************\n"); for (j = ZIPFSIZE; j > 1; j--) if (zipf[j]) break; for (i = 1; i < j; ++i) { ! printf("%3d -%6d ", i, zipf[i]); ! if (i % 6 == 0) putchar('\n'); } ! printf(">%d-%6d\n", ZIPFSIZE, zipf[0]); } #endif *************** *** 385,389 **** supfing = i + SUPFING; #if DEBUG ! (void) printf("reallocated superfinger space to %d, totpost=%ld\n", supersize, totpost); #endif --- 386,390 ---- supfing = i + SUPFING; #if DEBUG ! printf("reallocated superfinger space to %d, totpost=%ld\n", supersize, totpost); #endif *************** *** 400,404 **** supint = i + SUPINT; #if DEBUG ! (void) printf("reallocated superfinger offset to %d, totpost = %ld\n", supintsize * sizeof(long), totpost); #endif --- 401,405 ---- supint = i + SUPINT; #if DEBUG ! printf("reallocated superfinger offset to %d, totpost = %ld\n", supintsize * sizeof(long), totpost); #endif *************** *** 448,455 **** iteminfo.packword[1] = logicalblk.invblk[4]; tptr2 = logicalblk.chrblk + iteminfo.e.offset; ! (void) strncpy(supfing, tptr2, (int) iteminfo.e.size); *(supfing + iteminfo.e.size) = '\0'; #if DEBUG ! (void) printf("backup %d at term=%s to term=%s\n", backupflag, thisterm, supfing); #endif --- 449,456 ---- iteminfo.packword[1] = logicalblk.invblk[4]; tptr2 = logicalblk.chrblk + iteminfo.e.offset; ! strncpy(supfing, tptr2, (int) iteminfo.e.size); *(supfing + iteminfo.e.size) = '\0'; #if DEBUG ! printf("backup %d at term=%s to term=%s\n", backupflag, thisterm, supfing); #endif *************** *** 476,480 **** lastinblk = sizeof(t_logicalblk); /* add new term to superindex */ ! (void) strcpy(supfing, thisterm); supfing += strlen(thisterm) + 1; *supint++ = nextsupfing; --- 477,481 ---- lastinblk = sizeof(t_logicalblk); /* add new term to superindex */ ! strcpy(supfing, thisterm); supfing += strlen(thisterm) + 1; *supint++ = nextsupfing; *************** *** 489,493 **** iteminfo.e.space = 0; iteminfo.e.post = numpost; ! (void) strncpy(logicalblk.chrblk + lastinblk, thisterm, len); amtused += numwilluse; logicalblk.invblk[(lastinblk/sizeof(long))+wdlen] = nextpost; --- 490,494 ---- iteminfo.e.space = 0; iteminfo.e.post = numpost; ! strncpy(logicalblk.chrblk + lastinblk, thisterm, len); amtused += numwilluse; logicalblk.invblk[(lastinblk/sizeof(long))+wdlen] = nextpost; *************** *** 554,562 **** openedinvname: if (fread(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile) == 0) { ! (void) fprintf(stderr, "%s: empty inverted file\n", argv0); goto closeinv; } if (invcntl->param.version != FMTVERSION) { ! (void) fprintf(stderr, "%s: cannot read old index format; use -U option to force database to rebuild\n", argv0); goto closeinv; } --- 555,563 ---- openedinvname: if (fread(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile) == 0) { ! fprintf(stderr, "%s: empty inverted file\n", argv0); goto closeinv; } if (invcntl->param.version != FMTVERSION) { ! fprintf(stderr, "%s: cannot read old index format; use -U option to force database to rebuild\n", argv0); goto closeinv; } *************** *** 564,568 **** if (stat == 0 && invcntl->param.filestat == INVALONE) { ! (void) fprintf(stderr, "%s: inverted file is locked\n", argv0); goto closeinv; } --- 565,569 ---- if (stat == 0 && invcntl->param.filestat == INVALONE) { ! fprintf(stderr, "%s: inverted file is locked\n", argv0); goto closeinv; } *************** *** 611,615 **** invcntl->iindex = shmat(shm_id, 0, ((read_index) ? 0 : SHM_RDONLY)); if (invcntl->iindex == (char *)ERR) { ! (void) fprintf(stderr, "%s: shared memory link failed\n", argv0); invcntl->iindex = NULL; read_index = 1; --- 612,616 ---- invcntl->iindex = shmat(shm_id, 0, ((read_index) ? 0 : SHM_RDONLY)); if (invcntl->iindex == (char *)ERR) { ! fprintf(stderr, "%s: shared memory link failed\n", argv0); invcntl->iindex = NULL; read_index = 1; *************** *** 628,640 **** } if (read_index) { ! (void) fseek(invcntl->invfile, invcntl->param.startbyte, 0); ! (void) fread(invcntl->iindex, (int) invcntl->param.supsize, 1, invcntl->invfile); } invcntl->numblk = -1; if (boolready() == -1) { closeboth: ! (void) fclose(invcntl->postfile); closeinv: ! (void) fclose(invcntl->invfile); return(-1); } --- 629,642 ---- } if (read_index) { ! fseek(invcntl->invfile, invcntl->param.startbyte, SEEK_SET); ! fread(invcntl->iindex, (int) invcntl->param.supsize, 1, ! invcntl->invfile); } invcntl->numblk = -1; if (boolready() == -1) { closeboth: ! fclose(invcntl->postfile); closeinv: ! fclose(invcntl->invfile); return(-1); } *************** *** 643,647 **** if (stat > invcntl->param.filestat ) { rewind(invcntl->invfile); ! (void) fwrite(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile); } return(1); --- 645,649 ---- if (stat > invcntl->param.filestat ) { rewind(invcntl->invfile); ! fwrite(&invcntl->param, sizeof(invcntl->param), 1, invcntl->invfile); } return(1); *************** *** 656,670 **** invcntl->param.filestat = 0; rewind(invcntl->invfile); ! (void) fwrite(&invcntl->param, 1, sizeof(invcntl->param), invcntl->invfile); } if (invcntl->param.filestat == INVALONE) { /* write out the super finger */ ! (void) fseek(invcntl->invfile, invcntl->param.startbyte, 0); ! (void) fwrite(invcntl->iindex, 1, ! (int) invcntl->param.supsize, invcntl->invfile); } ! (void) fclose(invcntl->invfile); ! (void) fclose(invcntl->postfile); #if SHARE if (invcntl->param.share > 0) { --- 658,672 ---- invcntl->param.filestat = 0; rewind(invcntl->invfile); ! fwrite(&invcntl->param, 1, sizeof(invcntl->param), invcntl->invfile); } if (invcntl->param.filestat == INVALONE) { /* write out the super finger */ ! fseek(invcntl->invfile, invcntl->param.startbyte, SEEK_SET); ! fwrite(invcntl->iindex, 1, ! (int) invcntl->param.supsize, invcntl->invfile); } ! fclose(invcntl->invfile); ! fclose(invcntl->postfile); #if SHARE if (invcntl->param.share > 0) { *************** *** 691,696 **** /* now read in the block */ ! (void) fseek(invcntl->invfile, invcntl->numblk * invcntl->param.sizeblk + invcntl->param.cntlsize, 0); ! (void) fread(invcntl->logblk, (int) invcntl->param.sizeblk, 1, invcntl->invfile); invcntl->keypnt = 0; } --- 693,701 ---- /* now read in the block */ ! fseek(invcntl->invfile, ! invcntl->numblk*invcntl->param.sizeblk + invcntl->param.cntlsize, ! SEEK_SET); ! fread(invcntl->logblk, (int) invcntl->param.sizeblk, 1, ! invcntl->invfile); invcntl->keypnt = 0; } *************** *** 720,724 **** /* FIXME HBB: magic number alert! (3) */ entryptr = (ENTRY *)(invcntl->logblk->invblk + 3) + invcntl->keypnt; ! (void) strncpy(term, invcntl->logblk->chrblk + entryptr->offset, (int) entryptr->size); *(term + entryptr->size) = '\0'; --- 725,729 ---- /* FIXME HBB: magic number alert! (3) */ entryptr = (ENTRY *)(invcntl->logblk->invblk + 3) + invcntl->keypnt; ! strncpy(term, invcntl->logblk->chrblk + entryptr->offset, (int) entryptr->size); *(term + entryptr->size) = '\0'; *************** *** 764,770 **** /* note always fetch it if the file is busy */ if ((imid != invcntl->numblk) || (invcntl->param.filestat >= INVBUSY)) { ! (void) fseek(invcntl->invfile, (imid * invcntl->param.sizeblk) + invcntl->param.cntlsize, 0); invcntl->numblk = imid; ! (void) fread(invcntl->logblk, (int)invcntl->param.sizeblk, 1, invcntl->invfile); } --- 769,778 ---- /* note always fetch it if the file is busy */ if ((imid != invcntl->numblk) || (invcntl->param.filestat >= INVBUSY)) { ! fseek(invcntl->invfile, ! (imid*invcntl->param.sizeblk) + invcntl->param.cntlsize, ! SEEK_SET); invcntl->numblk = imid; ! fread(invcntl->logblk, (int)invcntl->param.sizeblk, 1, ! invcntl->invfile); } *************** *** 820,827 **** longptr = (long *)invcntl->iindex; n = *longptr++; ! (void) printf("Superindex dump, num blocks=%ld\n", n); longptr += j; while ((longptr <= ((long *)invcntl->iindex) + n) && invbreak == 0) { ! (void) printf("%2ld %6ld %s\n", j++, *longptr, invcntl->iindex + *longptr); longptr++; } --- 828,835 ---- longptr = (long *)invcntl->iindex; n = *longptr++; ! printf("Superindex dump, num blocks=%ld\n", n); longptr += j; while ((longptr <= ((long *)invcntl->iindex) + n) && invbreak == 0) { ! printf("%2ld %6ld %s\n", j++, *longptr, invcntl->iindex + *longptr); longptr++; } *************** *** 831,852 **** /* fetch the appropriate logical block */ invcntl->numblk = j; ! (void) fseek(invcntl->invfile, (j * invcntl->param.sizeblk) + invcntl->param.cntlsize, 0); ! (void) fread(invcntl->logblk, (int) invcntl->param.sizeblk, 1, invcntl->invfile); } else i = abs((int) invfind(invcntl, term)); longptr = invcntl->logblk->invblk; n = *longptr++; ! (void) printf("Entry term to invdump=%s, postings=%ld, forwrd ptr=%ld, back ptr=%ld\n" , term, i, *(longptr), *(longptr + 1)); /* FIXME HBB: magic number alert! (3) */ entryptr = (ENTRY *) (invcntl->logblk->invblk + 3); ! (void) printf("%ld terms in this block, block=%ld\n", n, invcntl->numblk); ! (void) printf("\tterm\t\t\tposts\tsize\toffset\tspace\t1st word\n"); for (j = 0; j < n && invbreak == 0; j++) { ptr = invcntl->logblk->chrblk + entryptr->offset; ! (void) strncpy(temp, ptr, (int) entryptr->size); temp[entryptr->size] = '\0'; ptr += (sizeof(long) * (long)((entryptr->size + (sizeof(long) - 1)) / sizeof(long))); ! (void) printf("%2ld %-24s\t%5ld\t%3d\t%d\t%d\t%ld\n", j, temp, entryptr->post, entryptr->size, entryptr->offset, entryptr->space, *(long *)ptr); --- 839,863 ---- /* fetch the appropriate logical block */ invcntl->numblk = j; ! fseek(invcntl->invfile, ! (j * invcntl->param.sizeblk) + invcntl->param.cntlsize, ! SEEK_SET); ! fread(invcntl->logblk, (int) invcntl->param.sizeblk, 1, ! invcntl->invfile); } else i = abs((int) invfind(invcntl, term)); longptr = invcntl->logblk->invblk; n = *longptr++; ! printf("Entry term to invdump=%s, postings=%ld, forwrd ptr=%ld, back ptr=%ld\n" , term, i, *(longptr), *(longptr + 1)); /* FIXME HBB: magic number alert! (3) */ entryptr = (ENTRY *) (invcntl->logblk->invblk + 3); ! printf("%ld terms in this block, block=%ld\n", n, invcntl->numblk); ! printf("\tterm\t\t\tposts\tsize\toffset\tspace\t1st word\n"); for (j = 0; j < n && invbreak == 0; j++) { ptr = invcntl->logblk->chrblk + entryptr->offset; ! strncpy(temp, ptr, (int) entryptr->size); temp[entryptr->size] = '\0'; ptr += (sizeof(long) * (long)((entryptr->size + (sizeof(long) - 1)) / sizeof(long))); ! printf("%2ld %-24s\t%5ld\t%3d\t%d\t%d\t%ld\n", j, temp, entryptr->post, entryptr->size, entryptr->offset, entryptr->space, *(long *)ptr); *************** *** 944,948 **** cannotalloc: invcannotalloc(u * sizeof(POSTING)); ! (void) boolready(); *num = -1; return(NULL); --- 955,959 ---- cannotalloc: invcannotalloc(u * sizeof(POSTING)); ! boolready(); *num = -1; return(NULL); *************** *** 956,961 **** } file = invcntl->postfile; ! (void) fseek(file, (long) *ptr2, 0); ! (void) fread(&posting, (int) sizeof(posting), 1, file); newsetc = 0; switch (boolarg) { --- 967,972 ---- } file = invcntl->postfile; ! fseek(file, *ptr2, SEEK_SET); ! fread(&posting, sizeof(posting), 1, file); newsetc = 0; switch (boolarg) { *************** *** 972,976 **** else if (set1p->lineoffset > posting.lineoffset) { *newsetp++ = posting; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 983,987 ---- else if (set1p->lineoffset > posting.lineoffset) { *newsetp++ = posting; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 981,985 **** else if (set1p->type > posting.type) { *newsetp++ = posting; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 992,996 ---- else if (set1p->type > posting.type) { *newsetp++ = posting; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 987,991 **** *newsetp++ = *set1p++; set1c++; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 998,1002 ---- *newsetp++ = *set1p++; set1c++; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1001,1005 **** *newsetp++ = posting; newsetc++; ! (void) fread(&posting, (int) sizeof(posting), 1, file); } } --- 1012,1016 ---- *newsetp++ = posting; newsetc++; ! fread(&posting, (int) sizeof(posting), 1, file); } } *************** *** 1014,1018 **** } else if (set1p->lineoffset > posting.lineoffset) { ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1025,1029 ---- } else if (set1p->lineoffset > posting.lineoffset) { ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1022,1026 **** } else if (set1p->type > posting.type) { ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1033,1037 ---- } else if (set1p->type > posting.type) { ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1029,1033 **** newsetc++; set1c++; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1040,1044 ---- newsetc++; set1c++; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1043,1047 **** } else if (set1p->lineoffset > posting.lineoffset) { ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1054,1058 ---- } else if (set1p->lineoffset > posting.lineoffset) { ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1052,1056 **** } else if (set1p->type > posting.type) { ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1063,1067 ---- } else if (set1p->type > posting.type) { ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1058,1062 **** set1c++; set1p++; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1069,1073 ---- set1c++; set1p++; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1076,1080 **** else if (set1p->lineoffset > posting.lineoffset) { *newsetp++ = posting; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1087,1091 ---- else if (set1p->lineoffset > posting.lineoffset) { *newsetp++ = posting; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1085,1089 **** else if (set1p->type > posting.type) { *newsetp++ = posting; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1096,1100 ---- else if (set1p->type > posting.type) { *newsetp++ = posting; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1091,1095 **** set1c++; set1p++; ! (void) fread(&posting, (int) sizeof(posting), 1, file); set2c++; } --- 1102,1106 ---- set1c++; set1p++; ! fread(&posting, (int) sizeof(posting), 1, file); set2c++; } *************** *** 1098,1102 **** *newsetp++ = posting; newsetc++; ! (void) fread(&posting, (int) sizeof(posting), 1, file); } item = newitem; --- 1109,1113 ---- *newsetp++ = posting; newsetc++; ! fread(&posting, (int) sizeof(posting), 1, file); } item = newitem; *************** *** 1123,1127 **** return(NULL); } ! /* if clear then give them what we have and use (void) boolready to realloc */ if (clear) { ptr = item; --- 1134,1138 ---- return(NULL); } ! /* if clear then give them what we have and use boolready to realloc */ if (clear) { ptr = item; *************** *** 1131,1135 **** else item2 = NULL; ! (void) boolready(); return(ptr); } --- 1142,1146 ---- else item2 = NULL; ! boolready(); return(ptr); } *************** *** 1151,1155 **** invcannotalloc(unsigned n) { ! (void) fprintf(stderr, "%s: cannot allocate %u bytes\n", argv0, n); } --- 1162,1166 ---- invcannotalloc(unsigned n) { ! fprintf(stderr, "%s: cannot allocate %u bytes\n", argv0, n); } *************** *** 1157,1161 **** invcannotopen(char *file) { ! (void) fprintf(stderr, "%s: cannot open file %s\n", argv0, file); } --- 1168,1172 ---- invcannotopen(char *file) { ! fprintf(stderr, "%s: cannot open file %s\n", argv0, file); } *************** *** 1164,1167 **** { perror(argv0); /* must be first to preserve errno */ ! (void) fprintf(stderr, "%s: write to file %s failed\n", argv0, file); } --- 1175,1178 ---- { perror(argv0); /* must be first to preserve errno */ ! fprintf(stderr, "%s: write to file %s failed\n", argv0, file); } |
From: Hans-Bernhard B. <br...@us...> - 2005-11-22 11:29:04
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8544 Modified Files: ChangeLog Log Message: Find C++ with three-letter filename extensions. Fix a bug in inverted index handling on 64-bit platforms. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.152 retrieving revision 1.153 diff -C2 -r1.152 -r1.153 *** ChangeLog 16 Aug 2005 20:05:35 -0000 1.152 --- ChangeLog 22 Nov 2005 11:28:54 -0000 1.153 *************** *** 1,2 **** --- 1,14 ---- + 2005-11-22 Hans-Bernhard Broeker <br...@ph...> + + * src/dir.c (issrcfile): Finally added auto-searching for + three-letter C++ file extensions *.tcc, *.cpp, *.cxx. Test all + matches to be regular files, not just those with two- and + three-character extensions. + + * src/invlib.c: Some cleanup. Replace 0 third argument to fseek + by proper SEEK_SET. Got rid of (void) result casts and some + function argument casts. + (invmake): Fix one sizeof(long)==4 assumption. + 2005-08-16 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2005-08-16 20:05:43
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19786/src Modified Files: main.c Log Message: Print number of references found in verbose line mode, before the actual list. Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** main.c 8 Jul 2005 11:00:21 -0000 1.37 --- main.c 16 Aug 2005 20:05:35 -0000 1.38 *************** *** 191,195 **** /* NOTREACHED */ } ! (void) strcpy(Pattern, s); goto nextarg; } --- 191,195 ---- /* NOTREACHED */ } ! strcpy(Pattern, s); goto nextarg; } *************** *** 259,263 **** } if (*s == '\0') { ! (void) fprintf(stderr, "%s: -%c option: missing or empty value\n", argv0, c); goto usage; --- 259,263 ---- } if (*s == '\0') { ! fprintf(stderr, "%s: -%c option: missing or empty value\n", argv0, c); goto usage; *************** *** 266,270 **** case 'f': /* alternate cross-reference file */ reffile = s; ! (void) strcpy(path, s); #ifdef SHORT_NAMES_ONLY /* System V has a 14 character limit */ --- 266,270 ---- case 'f': /* alternate cross-reference file */ reffile = s; ! strcpy(path, s); #ifdef SHORT_NAMES_ONLY /* System V has a 14 character limit */ *************** *** 275,281 **** #endif s = path + strlen(path); ! (void) strcpy(s, ".in"); invname = stralloc(path); ! (void) strcpy(s, ".po"); invpost = stralloc(path); break; --- 275,281 ---- #endif s = path + strlen(path); ! strcpy(s, ".in"); invname = stralloc(path); ! strcpy(s, ".po"); invpost = stralloc(path); break; *************** *** 291,295 **** case 'p': /* file path components to display */ if (*s < '0' || *s > '9' ) { ! (void) fprintf(stderr, "%s: -p option: missing or invalid numeric value\n", argv0); goto usage; --- 291,295 ---- case 'p': /* file path components to display */ if (*s < '0' || *s > '9' ) { ! fprintf(stderr, "%s: -p option: missing or invalid numeric value\n", argv0); goto usage; *************** *** 312,320 **** #endif default: ! (void) fprintf(stderr, "%s: unknown option: -%c\n", argv0, *s); usage: ! (void) usage(); ! (void) fprintf(stderr, "Try the -h option for more information.\n"); myexit(1); } --- 312,320 ---- #endif default: ! fprintf(stderr, "%s: unknown option: -%c\n", argv0, *s); usage: ! usage(); ! fprintf(stderr, "Try the -h option for more information.\n"); myexit(1); } *************** *** 351,355 **** orig_umask = umask(S_IRWXG|S_IRWXO); pid = getpid(); ! (void) sprintf(tempdirpv, "%s/cscope.%d", tmpdir, pid); if(mkdir(tempdirpv,S_IRWXU)) { --- 351,355 ---- orig_umask = umask(S_IRWXG|S_IRWXO); pid = getpid(); ! sprintf(tempdirpv, "%s/cscope.%d", tmpdir, pid); if(mkdir(tempdirpv,S_IRWXU)) { *************** *** 359,373 **** umask(orig_umask); ! (void) sprintf(temp1, "%s/cscope.1", tempdirpv, pid); ! (void) sprintf(temp2, "%s/cscope.2", tempdirpv, pid); /* if running in the foreground */ if (signal(SIGINT, SIG_IGN) != SIG_IGN) { /* cleanup on the interrupt and quit signals */ ! (void) signal(SIGINT, myexit); ! (void) signal(SIGQUIT, myexit); } /* cleanup on the hangup signal */ ! (void) signal(SIGHUP, myexit); /* if the database path is relative and it can't be created */ --- 359,373 ---- umask(orig_umask); ! sprintf(temp1, "%s/cscope.1", tempdirpv, pid); ! sprintf(temp2, "%s/cscope.2", tempdirpv, pid); /* if running in the foreground */ if (signal(SIGINT, SIG_IGN) != SIG_IGN) { /* cleanup on the interrupt and quit signals */ ! signal(SIGINT, myexit); ! signal(SIGQUIT, myexit); } /* cleanup on the hangup signal */ ! signal(SIGHUP, myexit); /* if the database path is relative and it can't be created */ *************** *** 380,389 **** * the home directory */ ! (void) sprintf(path, "%s/%s", home, reffile); if (isuptodate == NO || access(path, READ) == 0) { reffile = stralloc(path); ! (void) sprintf(path, "%s/%s", home, invname); invname = stralloc(path); ! (void) sprintf(path, "%s/%s", home, invpost); invpost = stralloc(path); } --- 380,389 ---- * the home directory */ ! sprintf(path, "%s/%s", home, reffile); if (isuptodate == NO || access(path, READ) == 0) { reffile = stralloc(path); ! sprintf(path, "%s/%s", home, invname); invname = stralloc(path); ! sprintf(path, "%s/%s", home, invpost); invpost = stralloc(path); } *************** *** 392,403 **** if (linemode == NO) { ! (void) signal(SIGINT, SIG_IGN); /* ignore interrupts */ ! (void) signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */ /* initialize the curses display package */ ! (void) initscr(); /* initialize the screen */ entercurses(); #if TERMINFO ! (void) keypad(stdscr, TRUE); /* enable the keypad */ # ifdef HAVE_FIXKEYPAD fixkeypad(); /* fix for getch() intermittently returning garbage */ --- 392,403 ---- if (linemode == NO) { ! signal(SIGINT, SIG_IGN); /* ignore interrupts */ ! signal(SIGPIPE, SIG_IGN);/* | command can cause pipe signal */ /* initialize the curses display package */ ! initscr(); /* initialize the screen */ entercurses(); #if TERMINFO ! keypad(stdscr, TRUE); /* enable the keypad */ # ifdef HAVE_FIXKEYPAD fixkeypad(); /* fix for getch() intermittently returning garbage */ *************** *** 433,439 **** /* see if there are options in the database */ for (;;) { ! (void) getc(oldrefs); /* skip the blank */ if ((c = getc(oldrefs)) != '-') { ! (void) ungetc(c, oldrefs); break; } --- 433,439 ---- /* see if there are options in the database */ for (;;) { ! getc(oldrefs); /* skip the blank */ if ((c = getc(oldrefs)) != '-') { ! ungetc(c, oldrefs); break; } *************** *** 444,448 **** case 'q': /* quick search */ invertedindex = YES; ! (void) fscanf(oldrefs, "%ld", &totalterms); break; case 'T': /* truncate symbols to 8 characters */ --- 444,448 ---- case 'q': /* quick search */ invertedindex = YES; ! fscanf(oldrefs, "%ld", &totalterms); break; case 'T': /* truncate symbols to 8 characters */ *************** *** 474,478 **** } s = (char *)mymalloc((unsigned) oldnum); ! (void) getc(oldrefs); /* skip the newline */ /* read the strings */ --- 474,478 ---- } s = (char *)mymalloc((unsigned) oldnum); ! getc(oldrefs); /* skip the newline */ /* read the strings */ *************** *** 499,503 **** s = path + 2; /* for "-Ipath" */ if (*s == '\0') { /* if "-I path" */ ! (void) fscanf(names, "%s", path); s = path; } --- 499,503 ---- s = path + 2; /* for "-Ipath" */ if (*s == '\0') { /* if "-I path" */ ! fscanf(names, "%s", path); s = path; } *************** *** 511,515 **** } } ! (void) fclose(names); } } --- 511,515 ---- } } ! fclose(names); } } *************** *** 523,527 **** } } ! (void) fclose(oldrefs); } else { --- 523,527 ---- } } ! fclose(oldrefs); } else { *************** *** 575,591 **** if (*Pattern != '\0') { /* do any optional search */ if (search() == YES) { ! while ((c = getc(refsfound)) != EOF) { ! (void) putchar(c); ! } } } ! if (onesearch == YES) { myexit(0); ! } for (;;) { char buf[PATLEN + 2]; ! (void) printf(">> "); ! (void) fflush(stdout); if (fgets(buf, sizeof(buf), stdin) == NULL) { myexit(0); --- 575,596 ---- if (*Pattern != '\0') { /* do any optional search */ if (search() == YES) { ! /* print the total number of lines in ! * verbose mode */ ! if (verbosemode == YES) ! printf("cscope: %d lines\n", ! totallines); ! ! while ((c = getc(refsfound)) != EOF) ! putchar(c); } } ! if (onesearch == YES) myexit(0); ! for (;;) { char buf[PATLEN + 2]; ! printf(">> "); ! fflush(stdout); if (fgets(buf, sizeof(buf), stdin) == NULL) { myexit(0); *************** *** 607,615 **** case '9': /* samuel only */ field = *buf - '0'; ! (void) strcpy(Pattern, buf + 1); ! (void) search(); ! (void) printf("cscope: %d lines\n", totallines); while ((c = getc(refsfound)) != EOF) { ! (void) putchar(c); } break; --- 612,620 ---- case '9': /* samuel only */ field = *buf - '0'; ! strcpy(Pattern, buf + 1); ! search(); ! printf("cscope: %d lines\n", totallines); while ((c = getc(refsfound)) != EOF) { ! putchar(c); } break; *************** *** 634,652 **** case 'R': /* rebuild database samuel style */ rebuild(); ! (void) putchar('\n'); break; case 'C': /* clear file names */ freefilelist(); ! (void) putchar('\n'); break; case 'F': /* add a file name */ ! (void) strcpy(path, buf + 1); if (infilelist(path) == NO && (s = inviewpath(path)) != NULL) { addsrcfile(s); } ! (void) putchar('\n'); break; --- 639,657 ---- case 'R': /* rebuild database samuel style */ rebuild(); ! putchar('\n'); break; case 'C': /* clear file names */ freefilelist(); ! putchar('\n'); break; case 'F': /* add a file name */ ! strcpy(path, buf + 1); if (infilelist(path) == NO && (s = inviewpath(path)) != NULL) { addsrcfile(s); } ! putchar('\n'); break; *************** *** 657,661 **** default: ! (void) fprintf(stderr, "cscope: unknown command '%s'\n", buf); break; } --- 662,666 ---- default: ! fprintf(stderr, "cscope: unknown command '%s'\n", buf); break; } *************** *** 671,678 **** if (*Pattern != '\0') { atfield(); /* move to the input field */ ! (void) command(ctrl('Y')); /* search */ } else if (reflines != NULL) { /* read any symbol reference lines file */ ! (void) readrefs(reflines); } display(); /* update the display */ --- 676,683 ---- if (*Pattern != '\0') { atfield(); /* move to the input field */ ! command(ctrl('Y')); /* search */ } else if (reflines != NULL) { /* read any symbol reference lines file */ ! readrefs(reflines); } display(); /* update the display */ *************** *** 715,724 **** char msg[MSGLEN + 1]; ! (void) snprintf(msg, sizeof(msg), "Removed file %s because write failed", file); #else char *msg = mymalloc(50+strlen(file)); ! (void) sprintf(msg, "Removed file %s because write failed", file); #endif --- 720,729 ---- char msg[MSGLEN + 1]; ! snprintf(msg, sizeof(msg), "Removed file %s because write failed", file); #else char *msg = mymalloc(50+strlen(file)); ! sprintf(msg, "Removed file %s because write failed", file); #endif *************** *** 729,733 **** #endif ! (void) unlink(file); myexit(1); /* calls exit(2), which closes files */ } --- 734,738 ---- #endif ! unlink(file); myexit(1); /* calls exit(2), which closes files */ } *************** *** 776,784 **** incurses = YES; #ifndef __MSDOS__ /* HBB 20010313 */ ! (void) nonl(); /* don't translate an output \n to \n\r */ #endif ! (void) cbreak(); /* single character input */ ! (void) noecho(); /* don't echo input characters */ ! (void) clear(); /* clear the screen */ mouseinit(); /* initialize any mouse interface */ drawscrollbar(topline, nextline); --- 781,789 ---- incurses = YES; #ifndef __MSDOS__ /* HBB 20010313 */ ! nonl(); /* don't translate an output \n to \n\r */ #endif ! cbreak(); /* single character input */ ! noecho(); /* don't echo input characters */ ! clear(); /* clear the screen */ mouseinit(); /* initialize any mouse interface */ drawscrollbar(topline, nextline); *************** *** 791,849 **** { /* clear the bottom line */ ! (void) move(LINES - 1, 0); ! (void) clrtoeol(); ! (void) refresh(); /* exit curses and restore the terminal modes */ ! (void) endwin(); incurses = NO; /* restore the mouse */ mousecleanup(); ! (void) fflush(stdout); } - /* normal usage message */ static void usage(void) { ! (void) fprintf(stderr, "Usage: cscope [-bcCdehklLqRTuUvV] [-f file] [-F file] [-i file] [-I dir] [-s dir]\n"); ! (void) fprintf(stderr, " [-p number] [-P path] [-[0-8] pattern] [source files]\n"); } - /* long usage message */ static void longusage(void) { ! (void) usage(); ! (void) fprintf(stderr, "\n"); ! (void) fprintf(stderr, "-b Build the cross-reference only.\n"); ! (void) fprintf(stderr, "-C Ignore letter case when searching.\n"); ! (void) fprintf(stderr, "-c Use only ASCII characters in the cross-ref file (don't compress).\n"); ! (void) fprintf(stderr, "-d Do not update the cross-reference.\n"); ! (void) fprintf(stderr, "-e Suppress the <Ctrl>-e command prompt between files.\n"); ! (void) fprintf(stderr, "-F symfile Read symbol reference lines from symfile.\n"); ! (void) fprintf(stderr, "-f reffile Use reffile as cross-ref file name instead of %s.\n", REFFILE); ! (void) fprintf(stderr, "-h This help screen.\n"); ! (void) fprintf(stderr, "-I incdir Look in incdir for any #include files.\n"); ! (void) fprintf(stderr, "-i namefile Browse through files listed in namefile, instead of %s\n", NAMEFILE); ! (void) fprintf(stderr, "-k Kernel Mode - don't use %s for #include files.\n", DFLT_INCDIR); ! (void) fprintf(stderr, "-L Do a single search with line-oriented output.\n"); ! (void) fprintf(stderr, "-l Line-oriented interface.\n"); ! (void) fprintf(stderr, "-num pattern Go to input field num (counting from 0) and find pattern.\n"); ! (void) fprintf(stderr, "-P path Prepend path to relative file names in pre-built cross-ref file.\n"); ! (void) fprintf(stderr, "-p n Display the last n file path components.\n"); ! (void) fprintf(stderr, "-q Build an inverted index for quick symbol searching.\n"); ! (void) fprintf(stderr, "-R Recurse directories for files.\n"); ! (void) fprintf(stderr, "-s dir Look in dir for additional source files.\n"); ! (void) fprintf(stderr, "-T Use only the first eight characters to match against C symbols.\n"); ! (void) fprintf(stderr, "-U Check file time stamps.\n"); ! (void) fprintf(stderr, "-u Unconditionally build the cross-reference file.\n"); ! (void) fprintf(stderr, "-v Be more verbose in line mode.\n"); ! (void) fprintf(stderr, "-V Print the version number.\n"); ! (void) fprintf(stderr, "\n"); ! (void) fprintf(stderr, "Please see the manpage for more information.\n"); } --- 796,862 ---- { /* clear the bottom line */ ! move(LINES - 1, 0); ! clrtoeol(); ! refresh(); /* exit curses and restore the terminal modes */ ! endwin(); incurses = NO; /* restore the mouse */ mousecleanup(); ! fflush(stdout); } + /* normal usage message */ static void usage(void) { ! fprintf(stderr, "Usage: cscope [-bcCdehklLqRTuUvV] [-f file] [-F file] [-i file] [-I dir] [-s dir]\n"); ! fprintf(stderr, " [-p number] [-P path] [-[0-8] pattern] [source files]\n"); } + /* long usage message */ static void longusage(void) { ! usage(); ! fprintf(stderr, "\ ! \n\ ! -b Build the cross-reference only.\n\ ! -C Ignore letter case when searching.\n\ ! -c Use only ASCII characters in the cross-ref file (don't compress).\n\ ! -d Do not update the cross-reference.\n\ ! -e Suppress the <Ctrl>-e command prompt between files.\n\ ! -F symfile Read symbol reference lines from symfile.\n\ ! -f reffile Use reffile as cross-ref file name instead of %s.\n", ! REFFILE); ! fprintf(stderr, "\ ! -h This help screen.\n\ ! -I incdir Look in incdir for any #include files.\n\ ! -i namefile Browse through files listed in namefile, instead of %s\n", ! NAMEFILE); ! fprintf(stderr, "\ ! -k Kernel Mode - don't use %s for #include files.\n", ! DFLT_INCDIR); ! fputs("\ ! -L Do a single search with line-oriented output.\n\ ! -l Line-oriented interface.\n\ ! -num pattern Go to input field num (counting from 0) and find pattern.\n\ ! -P path Prepend path to relative file names in pre-built cross-ref file.\n\ ! -p n Display the last n file path components.\n\ ! -q Build an inverted index for quick symbol searching.\n\ ! -R Recurse directories for files.\n\ ! -s dir Look in dir for additional source files.\n\ ! -T Use only the first eight characters to match against C symbols.\n\ ! -U Check file time stamps.\n\ ! -u Unconditionally build the cross-reference file.\n\ ! -v Be more verbose in line mode.\n\ ! -V Print the version number.\n\ ! \n\ ! Please see the manpage for more information.\n", ! stderr); } *************** *** 860,866 **** /* remove any temporary files */ if (temp1[0] != '\0') { ! (void) unlink(temp1); ! (void) unlink(temp2); ! (void) rmdir(tempdirpv); } /* restore the terminal to its original mode */ --- 873,879 ---- /* remove any temporary files */ if (temp1[0] != '\0') { ! unlink(temp1); ! unlink(temp2); ! rmdir(tempdirpv); } /* restore the terminal to its original mode */ *************** *** 870,874 **** /* dump core for debugging on the quit signal */ if (sig == SIGQUIT) { ! (void) abort(); } /* HBB 20000421: be nice: free allocated data */ --- 883,887 ---- /* dump core for debugging on the quit signal */ if (sig == SIGQUIT) { ! abort(); } /* HBB 20000421: be nice: free allocated data */ |
From: Hans-Bernhard B. <br...@us...> - 2005-08-16 20:05:43
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19786 Modified Files: ChangeLog Log Message: Print number of references found in verbose line mode, before the actual list. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.151 retrieving revision 1.152 diff -C2 -r1.151 -r1.152 *** ChangeLog 8 Jul 2005 11:16:29 -0000 1.151 --- ChangeLog 16 Aug 2005 20:05:35 -0000 1.152 *************** *** 1,2 **** --- 1,10 ---- + 2005-08-16 Hans-Bernhard Broeker <br...@ph...> + + * src/main.c: Uncluttered by removing nitpicky (void) casts. + (longusage): Reworked for source legibility even on 80-column + displays. + (main): If in verbose linemode, print number of references found, + first off. Patch from Elad Lahav, for Kscope + 2005-07-08 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2005-04-29 18:44:41
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22014 Modified Files: ChangeLog Log Message: New hotkey Ctrl-A duplicating function of Ctrl-Y in curses interface. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.148 retrieving revision 1.149 diff -C2 -r1.148 -r1.149 *** ChangeLog 14 Mar 2005 17:25:12 -0000 1.148 --- ChangeLog 29 Apr 2005 18:44:31 -0000 1.149 *************** *** 1,2 **** --- 1,12 ---- + 2005-04-29 Hans-Bernhard Broeker <br...@ph...> + + * src/command.c (command): Additional hotkey mapping of Ctrl-A to + same function as Ctrl-Y, like AT&T cscope, to evade Ctrl-Y + occupied as the DSUSP signal key on BSD'ish platforms. + + * src/help.c (help): Document additonal hotkey ^A. Mention + possible unavailability of some Ctrl keys because of terminal + settings. + 2005-03-14 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2005-04-29 18:44:39
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22014/src Modified Files: command.c help.c Log Message: New hotkey Ctrl-A duplicating function of Ctrl-Y in curses interface. Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** command.c 14 Mar 2005 17:24:47 -0000 1.27 --- command.c 29 Apr 2005 18:44:31 -0000 1.28 *************** *** 251,255 **** resetcmd(); } ! return(NO); case KEY_LL: /* go to last input field */ --- 251,255 ---- resetcmd(); } ! return(NO); case KEY_LL: /* go to last input field */ *************** *** 459,462 **** --- 459,463 ---- break; + case ctrl('A'): /* HBB 20050428: added alt. keymapping */ case ctrl('Y'): /* repeat last pattern */ if (*Pattern != '\0') { Index: help.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/help.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** help.c 13 Mar 2002 18:54:40 -0000 1.5 --- help.c 29 Apr 2005 18:44:31 -0000 1.6 *************** *** 66,71 **** *tp++ = "by pointing with the mouse and clicking button 1.\n"; *tp++ = "\nYou can either use the button 2 menu or these single-character commands:\n\n"; ! } ! else { *tp++ = "Press the RETURN key repeatedly to move to the desired input field, type the\n"; *tp++ = "pattern to search for, and then press the RETURN key. For the first 4 and\n"; --- 66,70 ---- *tp++ = "by pointing with the mouse and clicking button 1.\n"; *tp++ = "\nYou can either use the button 2 menu or these single-character commands:\n\n"; ! } else { *tp++ = "Press the RETURN key repeatedly to move to the desired input field, type the\n"; *tp++ = "pattern to search for, and then press the RETURN key. For the first 4 and\n"; *************** *** 91,95 **** *tp++ = "^P\t\tMove to the previous input field.\n"; } ! *tp++ = "^Y\t\tSearch with the last pattern typed.\n"; *tp++ = "^B\t\tRecall previous input field and search pattern.\n"; *tp++ = "^F\t\tRecall next input field and search pattern.\n"; --- 90,94 ---- *tp++ = "^P\t\tMove to the previous input field.\n"; } ! *tp++ = "^Y / ^A\t\tSearch with the last pattern typed.\n"; *tp++ = "^B\t\tRecall previous input field and search pattern.\n"; *tp++ = "^F\t\tRecall next input field and search pattern.\n"; *************** *** 105,110 **** *tp++ = "\nNote: If the first character of the pattern you want to search for matches\n"; *tp++ = "a command, type a \\ character first.\n"; ! } ! else { if (mouse) { *tp++ = "Point with the mouse and click button 1 to mark or unmark the line to be\n"; --- 104,109 ---- *tp++ = "\nNote: If the first character of the pattern you want to search for matches\n"; *tp++ = "a command, type a \\ character first.\n"; ! *tp++ = "Note: Some ctrl keys may be occupied by your terminal configuration.\n"; ! } else { if (mouse) { *tp++ = "Point with the mouse and click button 1 to mark or unmark the line to be\n"; |
From: Hans-Bernhard B. <br...@us...> - 2005-03-14 17:25:24
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14359 Modified Files: ChangeLog Log Message: Updated. Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -r1.147 -r1.148 *** ChangeLog 16 Feb 2005 20:49:23 -0000 1.147 --- ChangeLog 14 Mar 2005 17:25:12 -0000 1.148 *************** *** 1,2 **** --- 1,17 ---- + 2005-03-14 Hans-Bernhard Broeker <br...@ph...> + + * src/input.c (getline): Removed. Was just a minimally simplified + copy of mygetline() anyway, and it threatened to collide with a + like-named routine in libc. + + * src/global.h (getline): Removed prototype. + + * src/command.c (command): Changed all calls of getline() to + mygetline() with an empty string as the first argument. + + * src/egrep.y (memset): Changed #if condition around fallback + implementation to match that of the prototype in global.h. Should + fix SF bug #1163104 (build failure on FreeBSD). + 2005-02-16 Neil Horman <nh...@gm...> |
From: Hans-Bernhard B. <br...@us...> - 2005-03-14 17:24:58
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14234/src Modified Files: global.h input.c command.c Log Message: Removed getline(); replaced its calls by calls to mygetline(). Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** global.h 27 Oct 2004 11:32:46 -0000 1.32 --- global.h 14 Mar 2005 17:24:46 -0000 1.33 *************** *** 407,411 **** int egrep(char *file, FILE *output, char *format); - int getline(char s[], unsigned size, int firstchar, BOOL iscaseless); int mygetline(char p[], char s[], unsigned size, int firstchar, BOOL iscaseless); int mygetch(void); --- 407,410 ---- Index: input.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/input.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** input.c 4 Feb 2005 12:19:08 -0000 1.12 --- input.c 14 Mar 2005 17:24:46 -0000 1.13 *************** *** 238,377 **** return(i); } - /* get a line from the terminal in non-canonical mode */ - - int - getline(char s[], unsigned size, int firstchar, BOOL iscaseless) - { - int c, i = 0; - int j; - char *sright; /* substring to the right of the cursor */ - int ri = 0; /* position in right-string */ - - /* Inserts and deletes are always performed on the left-string, - * but we'll also have a right-string 'sright' to hold characters - * which are on the right of the cursor [insertion point]. - * - * Think of 'sright' as a stack -- we push chars into it when the cursor - * moves left, and we pop chars off it when the cursor moves right again. - * At the end of the function, we'll pop off any remaining characters - * onto the end of 's' - */ - sright = calloc(sizeof(char), size); - - /* if a character already has been typed */ - if (firstchar != '\0') { - if(iscaseless == YES) { - firstchar = tolower(firstchar); - } - addch(firstchar); /* display it */ - s[i++] = firstchar; /* save it */ - } - /* until the end of the line is reached */ - while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) { - - if (c == KEY_LEFT || c == ctrl('B')) { /* left */ - if (i > 0) { - addch('\b'); - /* move this char into the second (rhs) string */ - sright[ri++] = s[--i]; - } - } - else if (c == KEY_RIGHT || c == ctrl('F')) { /* right */ - if (i < size && ri > 0) { - /* move this char to the left of the cursor */ - s[i++] = sright[--ri]; - addch(s[i-1]); - } - } - else if ( - #ifdef KEY_HOME - c == KEY_HOME || - #endif - c == ctrl('A') ) { - while ( i > 0 ) { - sright[ri++] = s[--i]; - addch('\b'); - addch(s[i]); - addch('\b'); - } - } - else if ( - #ifdef KEY_END - c == KEY_END || - #endif - c == ctrl('E') ) { - while ( ri > 0 ) { - s[i++] = sright[--ri]; - addch(s[i-1]); - } - } - else if (c == erasechar() || c == KEY_BACKSPACE || c == DEL || c == ctrl('H') ) { - /* erase */ - if (i > 0) { - if (ri == 0) { - addstr("\b \b"); - } else { - addch('\b'); - delch(); - } - s[i] = '\0'; - --i; - } - } - else if (c == killchar() || c == KEY_BREAK) { /* kill */ - for (j = 0; j < i; ++j) { - addch('\b'); - } - for (j = 0; j < i; ++j) { - addch(' '); - } - for (j = 0; j < i; ++j) { - addch('\b'); - } - i = 0; - } - else if (isprint(c) || c == '\t') { /* printable */ - if(iscaseless == YES) { - c = tolower(c); - } - /* if it will fit on the line */ - if (i < size) { - s[i++] = c; /* save it */ - if (ri == 0) { - addch(c); /* display it */ - } else { - insch(c); /* display it */ - addch(c); /* advance cursor */ - } - } - } - #if UNIXPC - else if (unixpcmouse == YES && c == ESC) { /* mouse */ - (void) getmouseaction(ESC); /* ignore it */ - } - #endif - else if (mouse == YES && c == ctrl('X')) { - (void) getmouseaction(ctrl('X')); /* ignore it */ - } - else if (c == EOF) { /* end-of-file */ - break; - } - /* return on an empty line to allow a command to be entered */ - if (firstchar != '\0' && (i+ri) == 0) { - break; - } - } - - /* move any remaining chars on the rhs of the cursor - * onto the end of our string - */ - for (; ri > 0; ) { - s[i++] = sright[--ri]; - } - free(sright); - - s[i] = '\0'; - return(i); - } /* ask user to enter a character after reading the message */ --- 238,241 ---- Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -r1.26 -r1.27 *** command.c 16 Feb 2005 20:49:24 -0000 1.26 --- command.c 14 Mar 2005 17:24:47 -0000 1.27 *************** *** 82,86 **** struct cmd *curritem, *item; /* command history */ char *s; ! int lines, cols; switch (commandc) { --- 82,86 ---- struct cmd *curritem, *item; /* command history */ char *s; ! /* int lines, cols; --- HBB UNUSED 20050314 */ switch (commandc) { *************** *** 332,338 **** s = "a"; } ! if (c != '\r' && ! getline(newpat, COLS - sizeof(appendprompt), c, ! NO) > 0) { shellpath(filename, sizeof(filename), newpat); if ((file = myfopen(filename, s)) == NULL) { --- 332,339 ---- s = "a"; } ! if (c != '\r' && ! mygetline("", newpat, ! COLS - sizeof(appendprompt), c, NO) > 0 ! ) { shellpath(filename, sizeof(filename), newpat); if ((file = myfopen(filename, s)) == NULL) { *************** *** 355,360 **** (void) move(PRLINE, 0); (void) addstr(readprompt); ! if (getline(newpat, COLS - sizeof(readprompt), '\0', ! NO) > 0) { clearprompt(); shellpath(filename, sizeof(filename), newpat); --- 356,361 ---- (void) move(PRLINE, 0); (void) addstr(readprompt); ! if (mygetline("", newpat, COLS - sizeof(readprompt), ! '\0', NO) > 0) { clearprompt(); shellpath(filename, sizeof(filename), newpat); *************** *** 377,381 **** (void) move(PRLINE, 0); (void) addstr(pipeprompt); ! if (getline(newpat, COLS - sizeof(pipeprompt), '\0', NO) == 0) { clearprompt(); return(NO); --- 378,383 ---- (void) move(PRLINE, 0); (void) addstr(pipeprompt); ! if (mygetline("", newpat, COLS - sizeof(pipeprompt), '\0', NO) ! == 0) { clearprompt(); return(NO); *************** *** 518,544 **** /* FALLTHROUGH */ default: ! ! if (selecting && !mouse) ! { char *c; if ((c = strchr(dispchars, commandc))) editref(c - dispchars); - } /* if this is the start of a pattern */ ! else if (isprint(commandc)) { ! ispat: if (getline(newpat, COLS - fldcolumn - 1, commandc, ! caseless) > 0) { ! (void) strcpy(Pattern, newpat); ! resetcmd(); /* reset command history */ ! repeat: addcmd(field, Pattern); /* add to command history */ if (field == CHANGE) { - /* prompt for the new text */ ! (void) move(PRLINE, 0); ! (void) addstr(toprompt); ! (void) getline(newpat, COLS - sizeof(toprompt), '\0', NO); } /* search for the pattern */ --- 520,545 ---- /* FALLTHROUGH */ default: ! if (selecting && !mouse) { char *c; if ((c = strchr(dispchars, commandc))) editref(c - dispchars); /* if this is the start of a pattern */ ! } else if (isprint(commandc)) { ! ispat: ! if (mygetline("", newpat, COLS - fldcolumn - 1, ! commandc, caseless) > 0) { ! strcpy(Pattern, newpat); ! resetcmd(); /* reset command history */ ! repeat: addcmd(field, Pattern); /* add to command history */ if (field == CHANGE) { /* prompt for the new text */ ! move(PRLINE, 0); ! addstr(toprompt); ! mygetline("", newpat, ! COLS - sizeof(toprompt), ! '\0', NO); } /* search for the pattern */ *************** *** 559,577 **** return(changestring()); } ! } ! /* try to edit the file anyway */ ! else if (field == FILENAME && ! access(newpat, READ) == 0) { edit(newpat, "1"); } ! } ! else { /* no pattern--the input was erased */ return(NO); } ! } ! else { /* control character */ return(NO); } ! } return(YES); } --- 560,576 ---- return(changestring()); } ! ! } else if (field == FILENAME && ! access(newpat, READ) == 0) { ! /* try to edit the file anyway */ edit(newpat, "1"); } ! } else { /* no pattern--the input was erased */ return(NO); } ! } else { /* control character */ return(NO); } ! } /* switch(commandc) */ return(YES); } |
From: Hans-Bernhard B. <br...@us...> - 2005-03-14 17:23:16
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13777/src Modified Files: egrep.y Log Message: Change #if conditions around fallback definition of memset(). Index: egrep.y =================================================================== RCS file: /cvsroot/cscope/cscope/src/egrep.y,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** egrep.y 15 Sep 2003 10:59:49 -0000 1.9 --- egrep.y 14 Mar 2005 17:23:05 -0000 1.10 *************** *** 639,643 **** /* FIXME HBB: should export this to a separate file and use * AC_REPLACE_FUNCS() */ ! #if BSD /*LINTLIBRARY*/ /* --- 639,643 ---- /* FIXME HBB: should export this to a separate file and use * AC_REPLACE_FUNCS() */ ! #if !STDC_HEADERS && !defined(HAVE_MEMSET) && !defined(HAVE_MEMORY_H) /*LINTLIBRARY*/ /* |
From: Neil H. <nh...@us...> - 2005-02-16 20:49:45
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8089/src Modified Files: command.c main.c Log Message: fixing cscope builds for platforms w/ curses libs that don't support KEY_RESIZE (sourceforge bug 1123741) Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** command.c 4 Feb 2005 12:19:08 -0000 1.25 --- command.c 16 Feb 2005 20:49:24 -0000 1.26 *************** *** 411,415 **** entercurses(); break; ! case KEY_RESIZE: exitcurses(); --- 411,415 ---- entercurses(); break; ! #ifdef KEY_RESIZE case KEY_RESIZE: exitcurses(); *************** *** 430,434 **** display(); /* display the version number and input fields */ break; ! case ctrl('L'): /* redraw screen */ #ifdef KEY_CLEAR --- 430,434 ---- display(); /* display the version number and input fields */ break; ! #endif case ctrl('L'): /* redraw screen */ #ifdef KEY_CLEAR Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** main.c 4 Feb 2005 12:19:08 -0000 1.35 --- main.c 16 Feb 2005 20:49:24 -0000 1.36 *************** *** 123,130 **** --- 123,132 ---- #endif + #ifdef KEY_RESIZE void sigwinch_handler(int sig, siginfo_t *info, void *unused) { ungetch(KEY_RESIZE); } + #endif int *************** *** 139,143 **** --- 141,147 ---- pid_t pid; struct stat stat_buf; + #ifdef KEY_RESIZE struct sigaction winch_action; + #endif mode_t orig_umask; *************** *** 146,155 **** /* save the command name for messages */ argv0 = argv[0]; ! winch_action.sa_sigaction = sigwinch_handler; sigemptyset(&winch_action.sa_mask); winch_action.sa_flags = SA_SIGINFO; sigaction(SIGWINCH,&winch_action,NULL); ! /* set the options */ while (--argc > 0 && (*++argv)[0] == '-') { --- 150,159 ---- /* save the command name for messages */ argv0 = argv[0]; ! #ifdef KEY_RESIZE winch_action.sa_sigaction = sigwinch_handler; sigemptyset(&winch_action.sa_mask); winch_action.sa_flags = SA_SIGINFO; sigaction(SIGWINCH,&winch_action,NULL); ! #endif /* set the options */ while (--argc > 0 && (*++argv)[0] == '-') { |
From: Neil H. <nh...@us...> - 2005-02-16 20:49:42
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8089 Modified Files: ChangeLog Log Message: fixing cscope builds for platforms w/ curses libs that don't support KEY_RESIZE (sourceforge bug 1123741) Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -r1.146 -r1.147 *** ChangeLog 4 Feb 2005 12:19:07 -0000 1.146 --- ChangeLog 16 Feb 2005 20:49:23 -0000 1.147 *************** *** 1,2 **** --- 1,13 ---- + 2005-02-16 Neil Horman <nh...@gm...> + + * src/command.c (command): Added ifdef KEY_RESIZE around + KEY_RESIZE case in switch statement to allow curses + libraries which don't support resize events to build + + * src/main.c (main): Added ifdef KEY_RESIZE around + SIGWINCH handler and signal registration logic to + remove resize code from cscope when building with + curses libraries that don't support resize events + 2005-02-04 Neil Horman <nh...@gm...> |
From: Neil H. <nh...@us...> - 2005-02-04 12:19:18
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5194/src Modified Files: command.c input.c main.c Log Message: Fixing inadvertent exit on window resize (SourceForge Bug 1071236) Index: command.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/command.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -r1.24 -r1.25 *** command.c 27 Oct 2004 11:32:46 -0000 1.24 --- command.c 4 Feb 2005 12:19:08 -0000 1.25 *************** *** 82,85 **** --- 82,86 ---- struct cmd *curritem, *item; /* command history */ char *s; + int lines, cols; switch (commandc) { *************** *** 411,414 **** --- 412,434 ---- break; + case KEY_RESIZE: + exitcurses(); + initscr(); + entercurses(); + #if TERMINFO + (void) keypad(stdscr, TRUE); /* enable the keypad */ + #ifdef HAVE_FIXKEYPAD + fixkeypad(); /* fix for getch() intermittently returning garbage */ + #endif + #endif + #if UNIXPC + standend(); /* turn off reverse video */ + #endif + dispinit(); /* initialize display parameters */ + setfield(); /* set the initial cursor position */ + postmsg(""); /* clear any build progress message */ + display(); /* display the version number and input fields */ + break; + case ctrl('L'): /* redraw screen */ #ifdef KEY_CLEAR Index: input.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/input.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** input.c 30 Apr 2004 12:09:14 -0000 1.11 --- input.c 4 Feb 2005 12:19:08 -0000 1.12 *************** *** 44,47 **** --- 44,48 ---- #include <setjmp.h> /* jmp_buf */ #include <stdlib.h> + #include <errno.h> #if HAVE_SYS_TERMIOS_H #include <sys/termios.h> *************** *** 89,94 **** c = prevchar; prevchar = 0; ! } else ! c = getch(); /* get a character from the terminal */ } else { /* longjmp to here from signal handler */ c = KEY_BREAK; --- 90,102 ---- c = prevchar; prevchar = 0; ! } else { ! c = -1; ! while (c == -1) { ! /* get a character from the terminal */ ! c = getch(); ! if ((c == -1) && (errno != EINTR)) ! break; ! } ! } } else { /* longjmp to here from signal handler */ c = KEY_BREAK; Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** main.c 6 Dec 2004 14:56:43 -0000 1.34 --- main.c 4 Feb 2005 12:19:08 -0000 1.35 *************** *** 51,54 **** --- 51,55 ---- #include <sys/types.h> /* needed by stat.h */ #include <sys/stat.h> /* stat */ + #include <signal.h> /* defaults for unset environment variables */ *************** *** 122,125 **** --- 123,131 ---- #endif + void sigwinch_handler(int sig, siginfo_t *info, void *unused) + { + ungetch(KEY_RESIZE); + } + int main(int argc, char **argv) *************** *** 133,136 **** --- 139,143 ---- pid_t pid; struct stat stat_buf; + struct sigaction winch_action; mode_t orig_umask; *************** *** 140,143 **** --- 147,155 ---- argv0 = argv[0]; + winch_action.sa_sigaction = sigwinch_handler; + sigemptyset(&winch_action.sa_mask); + winch_action.sa_flags = SA_SIGINFO; + sigaction(SIGWINCH,&winch_action,NULL); + /* set the options */ while (--argc > 0 && (*++argv)[0] == '-') { |
From: Neil H. <nh...@us...> - 2005-02-04 12:19:17
|
Update of /cvsroot/cscope/cscope In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5194 Modified Files: ChangeLog Log Message: Fixing inadvertent exit on window resize (SourceForge Bug 1071236) Index: ChangeLog =================================================================== RCS file: /cvsroot/cscope/cscope/ChangeLog,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -r1.145 -r1.146 *** ChangeLog 1 Feb 2005 16:10:05 -0000 1.145 --- ChangeLog 4 Feb 2005 12:19:07 -0000 1.146 *************** *** 1,2 **** --- 1,17 ---- + 2005-02-04 Neil Horman <nh...@gm...> + + * src/command.c (command): Added KEY_RESIZE event case to + command switch to handle window re-drawing when a resize + event was received. + + * src/input.c (mygetch): Added error checking of return code + to restart call to getch in the event it returned early due + to a signal being delivered. + + * src/main.c (main): Registered a signal handler for the + SIGWINCH handler which is delivered when a terminal is + resized. Handler pushes a KEY_RESIZE event onto the head + of the command input queue. + 2005-02-01 Hans-Bernhard Broeker <br...@ph...> |
From: Hans-Bernhard B. <br...@us...> - 2005-02-01 16:10:18
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6076/src Modified Files: build.c Log Message: Ignore terminal interactivity check in -b -v mode. Index: build.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/build.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** build.c 30 Apr 2004 15:31:42 -0000 1.7 --- build.c 1 Feb 2005 16:10:06 -0000 1.8 *************** *** 340,347 **** putheader(newdir); fileversion = FILEVERSION; ! if (buildonly == YES && !isatty(0)) { interactive = NO; ! } ! else { searchcount = 0; } --- 340,346 ---- putheader(newdir); fileversion = FILEVERSION; ! if (buildonly == YES && verbosemode != YES && !isatty(0)) { interactive = NO; ! } else { searchcount = 0; } |