Menu
▾
▴
[Cscope-cvs] CVS: cscope/src build.c,1.6,1.7 global.h,1.30,1.31 main.c,1.32,1.33 vp.h,1.6,1.7
|
From: Hans-Bernhard B. <br...@us...> - 2004-04-30 15:31:52
|
Update of /cvsroot/cscope/cscope/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5888/src Modified Files: build.c global.h main.c vp.h Log Message: Updates driven by previous changes today. Index: build.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/build.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** build.c 8 Jan 2004 14:07:20 -0000 1.6 --- build.c 30 Apr 2004 15:31:42 -0000 1.7 *************** *** 321,325 **** /* get the first file name in the old cross-reference */ blocknumber = -1; ! (void) readblock(); /* read the first cross-ref block */ (void) scanpast('\t'); /* skip the header */ oldfile = getoldfile(); --- 321,325 ---- /* get the first file name in the old cross-reference */ blocknumber = -1; ! (void) read_block(); /* read the first cross-ref block */ (void) scanpast('\t'); /* skip the header */ oldfile = getoldfile(); *************** *** 601,610 **** dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = readblock()) != NULL); dbputc('\t'); /* copy the tab */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = readblock(); } /* exit if at the end of this file's data */ --- 601,610 ---- dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = read_block()) != NULL); dbputc('\t'); /* copy the tab */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = read_block(); } /* exit if at the end of this file's data */ *************** *** 644,653 **** dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = readblock()) != NULL); dbputc('\n'); /* copy the newline */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = readblock(); } /* exit if at the end of this file's data */ --- 644,653 ---- dbputc(*cp++); } ! } while (*++cp == '\0' && (cp = read_block()) != NULL); dbputc('\n'); /* copy the newline */ /* get the next character */ if (*(cp + 1) == '\0') { ! cp = read_block(); } /* exit if at the end of this file's data */ Index: global.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/global.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** global.h 30 Apr 2004 12:09:14 -0000 1.30 --- global.h 30 Apr 2004 15:31:42 -0000 1.31 *************** *** 262,266 **** extern int curdispline; extern char newpat[]; /* new pattern */ ! extern char pattern[]; /* symbol or text pattern */ /* crossref.c global data */ --- 262,266 ---- extern int curdispline; extern char newpat[]; /* new pattern */ ! extern char Pattern[]; /* symbol or text pattern */ /* crossref.c global data */ *************** *** 336,340 **** char *lookup(char *ident); char *pathcomponents(char *path, int components); ! char *readblock(void); char *scanpast(char c); --- 336,340 ---- char *lookup(char *ident); char *pathcomponents(char *path, int components); ! char *read_block(void); char *scanpast(char c); Index: main.c =================================================================== RCS file: /cvsroot/cscope/cscope/src/main.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** main.c 8 Jan 2004 14:07:20 -0000 1.32 --- main.c 30 Apr 2004 15:31:43 -0000 1.33 *************** *** 173,177 **** /* NOTREACHED */ } ! (void) strcpy(pattern, s); goto nextarg; } --- 173,177 ---- /* NOTREACHED */ } ! (void) strcpy(Pattern, s); goto nextarg; } *************** *** 373,380 **** #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 */ --- 373,380 ---- #if TERMINFO (void) keypad(stdscr, TRUE); /* enable the keypad */ ! # ifdef HAVE_FIXKEYPAD fixkeypad(); /* fix for getch() intermittently returning garbage */ ! # endif ! #endif /* TERMINFO */ #if UNIXPC standend(); /* turn off reverse video */ *************** *** 546,550 **** subprocess to emacs or samuel */ if (linemode == YES) { ! if (*pattern != '\0') { /* do any optional search */ if (search() == YES) { while ((c = getc(refsfound)) != EOF) { --- 546,550 ---- subprocess to emacs or samuel */ if (linemode == YES) { ! if (*Pattern != '\0') { /* do any optional search */ if (search() == YES) { while ((c = getc(refsfound)) != EOF) { *************** *** 580,584 **** case '9': /* samuel only */ field = *buf - '0'; ! (void) strcpy(pattern, buf + 1); (void) search(); (void) printf("cscope: %d lines\n", totallines); --- 580,584 ---- case '9': /* samuel only */ field = *buf - '0'; ! (void) strcpy(Pattern, buf + 1); (void) search(); (void) printf("cscope: %d lines\n", totallines); *************** *** 642,651 **** } /* do any optional search */ ! if (*pattern != '\0') { atfield(); /* move to the input field */ (void) command(ctrl('Y')); /* search */ ! } ! /* read any symbol reference lines file */ ! else if (reflines != NULL) { (void) readrefs(reflines); } --- 642,650 ---- } /* do any optional search */ ! 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); } Index: vp.h =================================================================== RCS file: /cvsroot/cscope/cscope/src/vp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** vp.h 15 Sep 2003 10:59:05 -0000 1.6 --- vp.h 30 Apr 2004 15:31:43 -0000 1.7 *************** *** 66,70 **** extern int vpndirs; /* number of directories in view path */ ! void vpinit(char *currentdir); int vpopen(char *path, int oflag); int vpaccess(char *path, mode_t amode); --- 66,70 ---- extern int vpndirs; /* number of directories in view path */ ! void vpinit(char *current_dir); int vpopen(char *path, int oflag); int vpaccess(char *path, mode_t amode); |
