?? 335to336.dif
字號:
diff -u -r --new-file agrep.335/Agrep.mak agrep.336/Agrep.mak
--- agrep.335/Agrep.mak Fri Jan 02 14:57:11 1998
+++ agrep.336/Agrep.mak Sat Jan 31 15:33:41 1998
@@ -35,11 +35,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\Agrep.exe"
+ALL : "$(OUTDIR)\agrepw32.exe"
!ELSE
-ALL : "$(OUTDIR)\Agrep.exe"
+ALL : "$(OUTDIR)\agrepw32.exe"
!ENDIF
@@ -67,12 +67,13 @@
-@erase "$(INTDIR)\sgrep.obj"
-@erase "$(INTDIR)\utilitie.obj"
-@erase "$(INTDIR)\vc50.idb"
- -@erase "$(OUTDIR)\Agrep.exe"
+ -@erase "$(OUTDIR)\agrepw32.exe"
CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D\
- "_MBCS" /D AGREP_POINTER=1 /D HAVE_DIRENT_H=1 /Fp"$(INTDIR)\Agrep.pch" /YX /FD\
- /c
+"_MBCS" /D AGREP_POINTER=1 /D HAVE_DIRENT_H=1 /D HAVE_SYS_DIR_H=0 /D\
+HAVE_SYS_NDIR=0 /D HAVE_NDIR_H=0 /D UTIME=0 /D ISO_CHAR_SET=1 /D\
+DOTCOMPRESSED=0 /D MEASURE_TIMES=0 /Fp"$(INTDIR)\Agrep.pch" /YX /FD /c
CPP_OBJS=.
CPP_SBRS=.
@@ -113,7 +114,7 @@
LINK32=link.exe
LINK32_FLAGS=setargv.obj /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\Agrep.pdb" /machine:I386 /out:"$(OUTDIR)\Agrep.exe"
+ /pdb:"$(OUTDIR)\Agrep.pdb" /machine:I386 /out:"$(OUTDIR)\agrepw32.exe"
LINK32_OBJS= \
"$(INTDIR)\agrep.obj" \
"$(INTDIR)\agrephlp.obj" \
@@ -138,7 +139,7 @@
"$(INTDIR)\sgrep.obj" \
"$(INTDIR)\utilitie.obj"
-"$(OUTDIR)\Agrep.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\agrepw32.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -153,11 +154,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\Agrep.exe"
+ALL : "$(OUTDIR)\agrepw32.exe"
!ELSE
-ALL : "$(OUTDIR)\Agrep.exe"
+ALL : "$(OUTDIR)\agrepw32.exe"
!ENDIF
@@ -186,14 +187,15 @@
-@erase "$(INTDIR)\utilitie.obj"
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
- -@erase "$(OUTDIR)\Agrep.exe"
+ -@erase "$(OUTDIR)\agrepw32.exe"
-@erase "$(OUTDIR)\Agrep.ilk"
-@erase "$(OUTDIR)\Agrep.pdb"
CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE"\
- /D "_MBCS" /D AGREP_POINTER=1 /D HAVE_DIRENT_H=1 /Fp"$(INTDIR)\Agrep.pch" /YX\
- /FD /c
+/D "_MBCS" /D AGREP_POINTER=1 /D HAVE_DIRENT_H=1 /D HAVE_SYS_DIR_H=0 /D\
+HAVE_SYS_NDIR=0 /D HAVE_NDIR_H=0 /D UTIME=0 /D ISO_CHAR_SET=1 /D\
+DOTCOMPRESSED=0 /D MEASURE_TIMES=0 /Fp"$(INTDIR)\Agrep.pch" /YX /FD /c
CPP_OBJS=.
CPP_SBRS=.
@@ -234,7 +236,7 @@
LINK32=link.exe
LINK32_FLAGS=setargv.obj /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)\Agrep.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Agrep.exe"\
+ /pdb:"$(OUTDIR)\Agrep.pdb" /debug /machine:I386 /out:"$(OUTDIR)\agrepw32.exe"\
/pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\agrep.obj" \
@@ -260,7 +262,7 @@
"$(INTDIR)\sgrep.obj" \
"$(INTDIR)\utilitie.obj"
-"$(OUTDIR)\Agrep.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\agrepw32.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
diff -u -r --new-file agrep.335/agrephlp.c agrep.336/agrephlp.c
--- agrep.335/agrephlp.c Tue Dec 30 11:37:05 1997
+++ agrep.336/agrephlp.c Sat Jan 31 15:28:57 1998
@@ -89,7 +89,13 @@
#ifndef _WIN32
ch=getchar();
#else
- ch=getch();
+ ch = _getch();
+ /* if it is a function key or a arrow key need to call twice; note
+ * that Ctrl-C IS ignored with this call
+ */
+ if (0xE0 == ch || 0 == ch)
+ /* map to extend scan codes */
+ ch = _getch() * 0x0100;
#endif
#endif
return ch;
Binary files agrep.335/agrepw32.exe and agrep.336/agrepw32.exe differ
diff -u -r --new-file agrep.335/maskgen.c agrep.336/maskgen.c
--- agrep.335/maskgen.c Tue Apr 08 00:50:01 1997
+++ agrep.336/maskgen.c Sat Jan 31 15:11:57 1998
@@ -47,7 +47,7 @@
/* the metasymbols are not transposed in that table */
if(NOUPPER) {
-#if (defined(__EMX__) && defined(ISO_CHAR_SET))
+#if (defined(__EMX__) && defined(ISO_CHAR_SET)) || (defined(_WIN32) && defined(ISO_CHAR_SET))
for(i=0; i<M; i++) Pattern[i] = LUT[Pattern[i]];
#else
for(i=0; i<M; i++) if(isalpha((int)Pattern[i]))
@@ -255,7 +255,7 @@
if(NOUPPER) for(i=0; i<MAXSYM; i++)
-#if (defined(__EMX__) && defined(ISO_CHAR_SET))
+#if (defined(__EMX__) && defined(ISO_CHAR_SET)) || (defined(_WIN32) && defined(ISO_CHAR_SET))
Mask[i] = Mask[LUT[i]];
#else
diff -u -r --new-file agrep.335/newmgrep.c agrep.336/newmgrep.c
--- agrep.335/newmgrep.c Fri Jan 02 14:14:47 1998
+++ agrep.336/newmgrep.c Sat Jan 31 15:12:29 1998
@@ -292,7 +292,7 @@
if(NOUPPER) {
for (i=0; i<MAXSYM; i++)
-#if (defined(__EMX__) && defined(ISO_CHAR_SET))
+#if (defined(__EMX__) && defined(ISO_CHAR_SET)) || (defined(_WIN32) && defined(ISO_CHAR_SET))
tr[i] = tr[LUT[i]];
#else
if (isupper(i)) tr[i] = tr[tolower(i)];
diff -u -r --new-file agrep.335/sgrep.c agrep.336/sgrep.c
--- agrep.335/sgrep.c Sun Jan 04 18:33:43 1998
+++ agrep.336/sgrep.c Sat Jan 31 15:11:31 1998
@@ -219,7 +219,7 @@
for(i=0; i<MAXSYM; i++)
-#if (defined(__EMX__) && defined(ISO_CHAR_SET))
+#if (defined(__EMX__) && defined(ISO_CHAR_SET)) || (defined(_WIN32) && defined(ISO_CHAR_SET))
TR[i] = TR[LUT[i]];
#else
@@ -1506,7 +1506,7 @@
/* if(NOUPPER) */ for(i=0; i<MAXSYM; i++) {
-#if (defined(__EMX__) && defined(ISO_CHAR_SET))
+#if (defined(__EMX__) && defined(ISO_CHAR_SET)) || (defined(_WIN32) && defined(ISO_CHAR_SET))
SHIFT[i] = SHIFT[LUT[i]];
#else
diff -u -r --new-file agrep.335/version.h agrep.336/version.h
--- agrep.335/version.h Fri Jan 02 14:14:47 1998
+++ agrep.336/version.h Sat Jan 31 15:38:19 1998
@@ -1,4 +1,7 @@
/*
+[fix] 3.36 DM 31.01.98 Windows: fix keyboard handling in agrephlp;
+ fix case sensitive searching in sgrep.c,
+ maskgen.c, newgrep.c
[fix] 3.35 TG 11.12.97 in agrep(): -f now working again
prepf() for multi-pattern was called
before the codepage LUT was prepared
@@ -39,7 +42,7 @@
*/
-#define AGREP_VERSION "3.35"
+#define AGREP_VERSION "3.36"
#ifdef __DOS
#define AGREP_OS "DOS"
?? 快捷鍵說明
復制代碼
Ctrl + C
搜索代碼
Ctrl + F
全屏模式
F11
切換主題
Ctrl + Shift + D
顯示快捷鍵
?
增大字號
Ctrl + =
減小字號
Ctrl + -