Fix bugs in Windows version.

gwsw · Aug 22, 1996 · bbb080c · bbb080c
1 parent abaab98
commit bbb080c
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 16 deletions.
diff --git a/Makefile.aut b/Makefile.aut
@@ -15,7 +15,7 @@ DISTFILES_W = \
  defines.ds Makefile.dsb Makefile.dsg Makefile.dsm \
  defines.o2 Makefile.o2e \
  defines.o9 Makefile.o9c Makefile.o9u \
- defines.wn Makefile.wnm
+ defines.wn Makefile.wnm Makefile.wnb
 DISTFILES = \
  ${SRC} regexp.c regexp.h \
  INSTALL Makefile.in Makefile.aut README NEWS \

diff --git a/Makefile.dsb b/Makefile.dsb
@@ -37,9 +37,9 @@ less$(EXT): $(OBJ)
 lesskey$(EXT): lesskey.obj version.obj
  $(CC) $(LDFLAGS) -e$@ lesskey.obj version.obj $(LIBS)
 
-defines.h: defines.dos
+defines.h: defines.ds
  -del defines.h
- -copy defines.dos defines.h
+ -copy defines.ds defines.h
 
 $(OBJ): less.h defines.h
 

diff --git a/Makefile.dsu b/Makefile.dsu
@@ -45,9 +45,9 @@ less: $(OBJ)
 lesskey: lesskey.obj version.obj
  $(CC) $(LDFLAGS) -o $@ lesskey.obj version.obj $(LIBS)
 
-defines.h: defines.dos
+defines.h: defines.ds
  -del defines.h
- -copy defines.dos defines.h
+ -copy defines.ds defines.h
 
 $(OBJ): less.h defines.h
 

diff --git a/Makefile.o2e b/Makefile.o2e
@@ -35,5 +35,5 @@ lesskey.exe: lesskey.${O} version.${O}
 
 ${OBJ}: defines.h less.h
 
-defines.h: defines.os2
- copy defines.os2 defines.h
+defines.h: defines.o2
+ copy defines.o2 defines.h
diff --git a/Makefile.o9g b/Makefile.o9g
@@ -37,5 +37,5 @@ lesskey: lesskey.${O} version.${O}
 
 ${OBJ}: defines.h less.h
 
-defines.h: defines.osk
- copy defines.os9 defines.h -rf
+defines.h: defines.o9
+ copy defines.o9 defines.h -rf
diff --git a/Makefile.wnb b/Makefile.wnb
@@ -36,9 +36,9 @@ less: ${OBJ}
 lesskey: lesskey.obj version.obj
  ${LD} ${LDFLAGS} ${LIBDIR}\c0x32.obj lesskey.obj version.obj, $@,,${LIBS}
 
-defines.h: defines.w32
+defines.h: defines.wn
  -del defines.h
- -copy defines.w32 defines.h
+ -copy defines.wn defines.h
 
 ${OBJ}: less.h defines.h funcs.h cmd.h
 

diff --git a/Makefile.wnm b/Makefile.wnm
@@ -35,9 +35,9 @@ less.exe: $(OBJ)
 lesskey.exe: lesskey.obj version.obj
  $(LD) $(LDFLAGS) lesskey.obj version.obj $(LIBS) /out:$@
 
-defines.h: defines.w32
+defines.h: defines.wn
  -del defines.h
- -copy defines.w32 defines.h
+ -copy defines.wn defines.h
 
 $(OBJ): less.h defines.h funcs.h cmd.h
 

diff --git a/NEWS.VER b/NEWS.VER
@@ -16,9 +16,13 @@
 
 * LeftArrow and RightArrow are same as ESC-[ and ESC-].
 
+* Now supports filenames containing spaces.
+
 * A "quit" command defined in a lesskey file may now have an "extra" 
  string, which is used to return an exit code from less when it quits.
 
+* Ported to Microsoft Visual C compiler for Windows.
+
 * Ported to DJGPP compiler for MS-DOS.
 
 * Bug fixes.

diff --git a/ch.c b/ch.c
@@ -671,7 +671,8 @@ seekable(f)
  int f;
 {
 #if MSDOS_COMPILER
- if (ch_file == fd0 && !isatty(fd0))
+ extern int fd0;
+ if (f == fd0 && !isatty(fd0))
  {
  /*
  * In MS-DOS, pipes are seekable. Check for

diff --git a/defines.wn b/defines.wn
@@ -310,7 +310,11 @@
 #define HAVE_UNISTD_H 0
 
 /* Define if you have the <values.h> header file. */
+#ifdef _MSC_VER
+#define HAVE_VALUES_H 0
+#else
 #define HAVE_VALUES_H 1
+#endif
 
 #define popen _popen
 #define pclose _pclose
diff --git a/less.nro.VER b/less.nro.VER
@@ -264,6 +264,8 @@ The filename is inserted into the command line list of files
 so that it can be seen by subsequent :n and :p commands.
 If the filename consists of several files, they are all inserted into
 the list of files and the first one is examined.
+If the filename contains one or more spaces,
+the entire filename should be enclosed in double quotes.
 .IP "^X^V or E"
 Same as :e.
 Warning: some systems use ^V as a special literalization character.

diff --git a/signal.c b/signal.c
@@ -139,8 +139,6 @@ wbreak_handler(dwCtrlType)
  case CTRL_C_EVENT:
  case CTRL_BREAK_EVENT:
  sigs |= S_INTERRUPT;
- if (reading)
- intread();
  return (TRUE);
  default:
  break;