From 8a6d5da7cc56803406d391456105c6a37e1e0671 Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Tue, 23 May 2006 10:43:33 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 16c4e538939..9ba3191ed46 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2006-05-23 Francesco Potort,Al(B + + * pop.c (pop_open, socket_connection, KPOP_SERVICE): Added + comments explaining why the "kpop" service is never used. + 2006-05-13 Eli Zaretskii * makefile.w32-in (lisp1): Add fringe.elc. -- cgit v1.2.1 From 81264b3846c31bd987a7788fa656dd76345cc8e7 Mon Sep 17 00:00:00 2001 From: Francesco Potortì Date: Tue, 23 May 2006 10:44:39 +0000 Subject: (pop_open, socket_connection, KPOP_SERVICE): Added comments explaining why the "kpop" service is never used. --- lib-src/pop.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib-src') diff --git a/lib-src/pop.c b/lib-src/pop.c index 7d6bcc5cdc9..5dcbf2d2483 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -135,7 +135,7 @@ static char *find_crlf __P((char *, int)); #define KPOP_PORT 1109 #define POP_SERVICE "pop3" /* we don't want the POP2 port! */ #ifdef KERBEROS -#define KPOP_SERVICE "kpop" +#define KPOP_SERVICE "kpop" /* never used: look for 20060515 to see why */ #endif char pop_error[ERROR_MAX]; @@ -264,10 +264,11 @@ pop_open (host, username, password, flags) return (0); } } - if (password) + if (password) /* always true, detected 20060515 */ flags |= POP_NO_KERBEROS; else - password = username; + password = username; /* dead code, detected 20060515 */ + /** "kpop" service is never used: look for 20060515 to see why **/ sock = socket_connection (host, flags); if (sock == -1) @@ -1047,6 +1048,7 @@ socket_connection (host, flags) bzero ((char *) &addr, sizeof (addr)); addr.sin_family = AF_INET; + /** "kpop" service is never used: look for 20060515 to see why **/ #ifdef KERBEROS service = (flags & POP_NO_KERBEROS) ? POP_SERVICE : KPOP_SERVICE; #else @@ -1073,6 +1075,7 @@ socket_connection (host, flags) } else { + /** "kpop" service is never used: look for 20060515 to see why **/ #ifdef KERBEROS addr.sin_port = htons ((flags & POP_NO_KERBEROS) ? POP_PORT : KPOP_PORT); -- cgit v1.2.1 From 04a1dad0855a77fc160d38c0b91a107168c97475 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 12:10:37 +0000 Subject: Remove the file. --- lib-src/leditcfns.c | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 lib-src/leditcfns.c (limited to 'lib-src') diff --git a/lib-src/leditcfns.c b/lib-src/leditcfns.c deleted file mode 100644 index 239db1cd1fa..00000000000 --- a/lib-src/leditcfns.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#define STRLEN 100 -static char str[STRLEN+1] = "%?emacs"; /* extra char for the null */ - -switch_to_proc(){ - char *ptr = str; - while (*ptr) ioctl(0, TIOCSTI, ptr++); - ioctl(0, TIOCSTI, "\n"); - kill(getpid(), SIGTSTP); - } - -set_proc_str(ptr) char *ptr; { - if (strlen(ptr) <= STRLEN) - strcpy(str, ptr); - else - printf("string too long for set-proc-str: %s\n", ptr); - } - -/* arch-tag: eb7ae804-0d6e-4077-ab42-7173821410c3 - (do not change this comment) */ -- cgit v1.2.1 From 1f4fd92cafe64500baac93d76e15ba6b91272d48 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 12:12:13 +0000 Subject: Delete traces of leditcfns.c. --- lib-src/makefile.w32-in | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib-src') diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 6aa15964f45..7cc4c27aa5b 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -34,7 +34,6 @@ LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ # $(BLD)/env.exe \ # $(BLD)/server.exe \ # $(BLD)/emacstool.exe \ -# $(BLD)/leditcfns.exe \ # $(BLD)/emacsclient.exe \ # $(BLD)/cvtmail.exe \ # $(BLD)/digest-doc.exe \ @@ -117,7 +116,6 @@ $(BLD)/ctags.$(O): ctags.c # $(BLD)/sorted-doc.exe: $(BLD)/sorted-doc.$(O) # $(BLD)/yow.exe: $(BLD)/yow.$(O) # $(BLD)/emacstool.exe: $(BLD)/emacstool.$(O) -# $(BLD)/leditcfns.exe: $(BLD)/leditcfns.$(O) # $(BLD)/server.exe: $(BLD)/server.$(O) # $(BLD)/cvtmail.exe: $(BLD)/cvtmail.$(O) # $(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) -- cgit v1.2.1 From a941b26bc2e35cbf10cc9ee2f08d35c0af433f23 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 12:12:34 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 9ba3191ed46..6d64d79b7bd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2006-06-03 Eli Zaretskii + + * makefile.w32-in: Delete traces of leditcfns.c. + + * leditcfns.c: Remove file. + 2006-05-23 Francesco Potort,Al(B * pop.c (pop_open, socket_connection, KPOP_SERVICE): Added -- cgit v1.2.1 From e75dcee327e6ece31d765beff38f6784745c87ce Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 14:51:25 +0000 Subject: [DOS_NT] : Include fcntl.h and io.h. [WINDOWSNT] : Don't redeclare malloc. (main) [DOS_NT]: Switch stdin to binary mode, if it is not a terminal device. --- lib-src/sorted-doc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib-src') diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 0a06aa2c984..67bddbc3304 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -29,9 +29,15 @@ #include #include +#ifdef DOS_NT +#include /* for O_BINARY */ +#include /* for setmode */ +#endif #ifndef HAVE_STDLIB_H /* config.h includes stdlib. */ +#ifndef WINDOWSNT /* src/s/ms-w32.h includes stdlib.h */ extern char *malloc (); #endif +#endif #define NUL '\0' #define MARKER '\037' @@ -134,6 +140,12 @@ main () DOCSTR *docs = NULL; /* chain of allocated DOCSTRS */ char buf[512]; /* line buffer */ +#ifdef DOS_NT + /* DOC is a binary file. */ + if (!isatty (fileno (stdin))) + setmode (fileno (stdin), O_BINARY); +#endif + while (1) /* process one char at a time */ { /* this char from the DOCSTR file */ -- cgit v1.2.1 From ae85efdbd570887c527abcf0498d039b388b3a8f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 14:51:44 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6d64d79b7bd..61e0d42ab1c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,10 @@ 2006-06-03 Eli Zaretskii + * sorted-doc.c [DOS_NT] : Include fcntl.h and io.h. + [WINDOWSNT] : Don't redeclare malloc. + (main) [DOS_NT]: Switch stdin to binary mode, if it is not a + terminal device. + * makefile.w32-in: Delete traces of leditcfns.c. * leditcfns.c: Remove file. -- cgit v1.2.1 From 37c49f02a0e237509b8b8e200d8cc0f1baa46843 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 14:58:50 +0000 Subject: (main): Initialize bp, to avoid compiler warnings --- lib-src/sorted-doc.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib-src') diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index 67bddbc3304..a8b2d441f9a 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c @@ -146,6 +146,8 @@ main () setmode (fileno (stdin), O_BINARY); #endif + bp = buf; + while (1) /* process one char at a time */ { /* this char from the DOCSTR file */ -- cgit v1.2.1 From 1b178b9902fce72c5e08cb0ef6527615477f510f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 15:05:05 +0000 Subject: [DOS_NT] : Include fcntl.h and io.h. (main) [DOS_NT]: Switch stdin to binary mode, if it is not a terminal device. --- lib-src/ChangeLog | 5 +++++ lib-src/digest-doc.c | 11 +++++++++++ 2 files changed, 16 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 61e0d42ab1c..c448ac31c5d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,9 +1,14 @@ 2006-06-03 Eli Zaretskii + * digest-doc.c [DOS_NT] : Include fcntl.h and io.h. + (main) [DOS_NT]: Switch stdin to binary mode, if it is not a + terminal device. + * sorted-doc.c [DOS_NT] : Include fcntl.h and io.h. [WINDOWSNT] : Don't redeclare malloc. (main) [DOS_NT]: Switch stdin to binary mode, if it is not a terminal device. + (main): Initialize bp, to avoid compiler warnings * makefile.w32-in: Delete traces of leditcfns.c. diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c index 7b5a9677e7c..7787d422e39 100644 --- a/lib-src/digest-doc.c +++ b/lib-src/digest-doc.c @@ -26,12 +26,23 @@ #include +#ifdef DOS_NT +#include /* for O_BINARY */ +#include /* for setmode */ +#endif + int main () { register int ch; register int notfirst = 0; +#ifdef DOS_NT + /* DOC is a binary file. */ + if (!isatty (fileno (stdin))) + setmode (fileno (stdin), O_BINARY); +#endif + printf (".TL\n"); printf ("Command Summary for GNU Emacs\n"); printf (".AU\nRichard M. Stallman\n"); -- cgit v1.2.1 From 9781fb53c897dc37a13a490e988977758029a3c2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 3 Jun 2006 15:30:02 +0000 Subject: (ALL): Add sorted-doc and digest-doc. ($(BLD)/sorted-doc.exe, $(BLD)/digest-doc.exe) ($(BLD)/test-distrib.exe): New targets. (sorted-doc, digest-doc, test-distrib): New targets. (install): Install sorted-doc.exe and digest-doc.exe. ($(BLD)/sorted-doc.$(O)): Update dependencies. --- lib-src/ChangeLog | 7 +++++++ lib-src/makefile.w32-in | 27 ++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c448ac31c5d..eaaa293e293 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,12 @@ 2006-06-03 Eli Zaretskii + * makefile.w32-in (ALL): Add sorted-doc and digest-doc. + ($(BLD)/sorted-doc.exe, $(BLD)/digest-doc.exe) + ($(BLD)/test-distrib.exe): New targets. + (sorted-doc, digest-doc, test-distrib): New targets. + (install): Install sorted-doc.exe and digest-doc.exe. + ($(BLD)/sorted-doc.$(O)): Update dependencies. + * digest-doc.c [DOS_NT] : Include fcntl.h and io.h. (main) [DOS_NT]: Switch stdin to binary mode, if it is not a terminal device. diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 7cc4c27aa5b..aaa35aec040 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -ALL = make-docfile hexl ctags etags movemail ebrowse +ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc .PHONY: $(ALL) @@ -30,14 +30,10 @@ LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ # don't know what (if) to do with these yet... # -# $(BLD)/sorted-doc.exe \ -# $(BLD)/env.exe \ # $(BLD)/server.exe \ # $(BLD)/emacstool.exe \ # $(BLD)/emacsclient.exe \ # $(BLD)/cvtmail.exe \ -# $(BLD)/digest-doc.exe \ -# $(BLD)/test-distrib.exe \ LIBS = $(BASE_LIBS) $(ADVAPI32) @@ -47,6 +43,12 @@ $(BLD)/hexl.exe: $(BLD)/hexl.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS) $(BLD)/fakemail.exe: $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/fakemail.$(O) $(BLD)/ntlib.$(O) $(LIBS) +$(BLD)/sorted-doc.exe: $(BLD)/sorted-doc.$(O) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/sorted-doc.$(O) $(LIBS) +$(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/digest-doc.$(O) $(LIBS) +$(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) + $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS) make-docfile: $(BLD) $(BLD)/make-docfile.exe ctags: $(BLD) $(BLD)/ctags.exe @@ -55,6 +57,11 @@ ebrowse: $(BLD) $(BLD)/ebrowse.exe hexl: $(BLD) $(BLD)/hexl.exe movemail: $(BLD) $(BLD)/movemail.exe fakemail: $(BLD) $(BLD)/fakemail.exe +sorted-doc: $(BLD) $(BLD)/sorted-doc.exe +digest-doc: $(BLD) $(BLD)/digest-doc.exe + +test-distrib: $(BLD) $(BLD)/test-distrib.exe + "$(BLD)/test-distrib.exe" "$(SRC)/testfile" GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) GETOPTDEPS = $(GETOPTOBJS) getopt.h @@ -113,14 +120,11 @@ $(BLD)/ctags.$(O): ctags.c # # don't know what to do with these yet... # -# $(BLD)/sorted-doc.exe: $(BLD)/sorted-doc.$(O) # $(BLD)/yow.exe: $(BLD)/yow.$(O) # $(BLD)/emacstool.exe: $(BLD)/emacstool.$(O) # $(BLD)/server.exe: $(BLD)/server.$(O) # $(BLD)/cvtmail.exe: $(BLD)/cvtmail.$(O) -# $(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) # $(BLD)/emacsclient.exe: $(BLD)/emacsclient.$(O) -# $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) # # From ..\src\Makefile.in @@ -291,6 +295,8 @@ install: $(INSTALL_FILES) $(CP) $(BLD)/ctags.exe $(INSTALL_DIR)/bin $(CP) $(BLD)/hexl.exe $(INSTALL_DIR)/bin $(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin + $(CP) $(BLD)/sorted-doc.exe $(INSTALL_DIR)/bin + $(CP) $(BLD)/digest-doc.exe $(INSTALL_DIR)/bin - mkdir "$(INSTALL_DIR)/etc" $(CP) $(DOC) $(INSTALL_DIR)/etc @@ -446,7 +452,10 @@ $(BLD)/qsort.$(O) : \ $(SRC)/qsort.c $(BLD)/sorted-doc.$(O) : \ - $(SRC)/sorted-doc.c + $(SRC)/sorted-doc.c \ + $(EMACS_ROOT)/src/s/ms-w32.h \ + $(EMACS_ROOT)/src/m/intel386.h \ + $(EMACS_ROOT)/src/config.h \ $(BLD)/tcp.$(O) : \ $(SRC)/tcp.c -- cgit v1.2.1 From 0f29c66d2557458cd49b32ad48d5baed25533295 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Sat, 3 Jun 2006 17:49:36 +0000 Subject: (main): Exit with EXIT_FAILURE if BROWSE file doesn't exist, is not seekable, not is failed in ftall. --- lib-src/ChangeLog | 5 +++++ lib-src/ebrowse.c | 22 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index eaaa293e293..40b4779dea4 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2006-06-04 Masatake YAMATO + + * ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file + doesn't exist, is not seekable, not is failed in ftall. + 2006-06-03 Eli Zaretskii * makefile.w32-in (ALL): Add sorted-doc and digest-doc. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 94fa9114d23..398dd10896e 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3909,17 +3909,31 @@ main (argc, argv) fp = fopen (out_filename, "r"); if (fp == NULL) - yyerror ("file `%s' must exist for --append", out_filename); + { + yyerror ("file `%s' must exist for --append", out_filename); + exit (EXIT_FAILURE); + } rc = fseek (fp, 0, SEEK_END); if (rc == -1) - yyerror ("error seeking in file `%s'", out_filename); + { + yyerror ("error seeking in file `%s'", out_filename); + exit (EXIT_FAILURE); + } rc = ftell (fp); if (rc == -1) - yyerror ("error getting size of file `%s'", out_filename); + { + yyerror ("error getting size of file `%s'", out_filename); + exit (EXIT_FAILURE); + } + else if (rc == 0) - yyerror ("file `%s' is empty", out_filename); + { + yyerror ("file `%s' is empty", out_filename); + /* It may be ok to use an empty file for appending. + exit (EXIT_FAILURE); */ + } fclose (fp); } -- cgit v1.2.1 From 63fbb6441f2aee292a11621e375ce2e52797d6c0 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Mon, 5 Jun 2006 11:56:03 +0000 Subject: Formatting fixes. --- lib-src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 40b4779dea4..557d8a2d492 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,6 +1,6 @@ 2006-06-04 Masatake YAMATO - * ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file + * ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file doesn't exist, is not seekable, not is failed in ftall. 2006-06-03 Eli Zaretskii -- cgit v1.2.1