diff -rc lynx2-8-1.orig/config.hin lynx2-8-1/config.hin *** lynx2-8-1.orig/config.hin Sat Aug 15 22:57:56 1998 --- lynx2-8-1/config.hin Sun Aug 23 20:32:46 1998 *************** *** 69,74 **** --- 69,75 ---- #undef LYNXCGI_LINKS /* CF_ARG_ENABLE(cgi-links) */ #undef LYNX_CFG_FILE /* $libdir/lynx.cfg */ #undef LYNX_LSS_FILE /* $libdir/lynx.lss */ + #undef LYNX_COMPILE_OPTS /* $logdir/lynx_site.txt */ #undef LY_FIND_LEAKS /* configure --disable-leaks */ #undef MKDIR_PATH /* CF_PATH_PROG(mkdir) */ #undef MV_PATH /* CF_PATH_PROG(mv) */ diff -rc lynx2-8-1.orig/makefile.in lynx2-8-1/makefile.in *** lynx2-8-1.orig/makefile.in Fri Aug 21 14:30:14 1998 --- lynx2-8-1/makefile.in Sun Aug 23 20:43:15 1998 *************** *** 39,44 **** --- 39,47 ---- ## Where you want the help-files installed helpdir= @libdir@/lynx_help + ## Where you want the compile logs installed + logdir= @help_dir@ + ##set the relative location of the WWW library Implementation directory, ##from this directory ##do not set this to be an absolute path!!! *************** *** 218,224 **** compress: tar cd ..; rm -f $(lynxname).tar.Z; compress -f -v $(lynxname).tar ! install: lynx$x install-bin install-man install-cfg @INSTALL_LSS@ @echo @echo "Use $(MAKE) install-help to install the help-files" @echo --- 221,227 ---- compress: tar cd ..; rm -f $(lynxname).tar.Z; compress -f -v $(lynxname).tar ! install: lynx$x install-bin install-man install-cfg @INSTALL_LSS@ install-log @echo @echo "Use $(MAKE) install-help to install the help-files" @echo *************** *** 256,261 **** --- 259,270 ---- -mv -f $(libdir)/lynx.lss $(libdir)/lynx.oldlss $(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(libdir)/lynx.lss + install-log : $(libdir) config.cache + -sed -e '/^#/d' \ + -e 's/^.._cv_\(.*\)=.*=\(.*\)\}/\1=\2/g' \ + config.cache | \ + awk -F= '{printf "%-30s = %s\n",\$1,\$2}' > $(logdir)/lynx_site.txt + uninstall: -rm -f $(bindir)/lynx$x -rm -f $(mandir)/lynx.1 diff -rc lynx2-8-1.orig/userdefs.h lynx2-8-1/userdefs.h *** lynx2-8-1.orig/userdefs.h Fri Aug 21 14:30:14 1998 --- lynx2-8-1/userdefs.h Sun Aug 23 20:33:41 1998 *************** *** 1215,1220 **** --- 1215,1228 ---- * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ #define LYNX_VERSION "2.8.1dev.22" + #define LYNX_WWW_HOME "http://lynx.browser.org" + #define LYNX_WWW_DIST "http://www.slcc.edu/lynx/current/" + #define LYNX_RELEASE FALSE + #ifndef LYNX_RELEASE + #define LYNX_WWW LYNX_WWW_DIST + #else + #define LYNX_WWW LYNX_WWW_HOME + #endif #ifndef MAXINT #define MAXINT 2147483647 /* max integer */ diff -rc lynx2-8-1.orig/src/LYCookie.c lynx2-8-1/src/LYCookie.c *** lynx2-8-1.orig/src/LYCookie.c Fri Aug 21 14:30:14 1998 --- lynx2-8-1/src/LYCookie.c Sun Aug 23 23:13:48 1998 *************** *** 2274,2289 **** sprintf(buf, "
\n\n", ! LYNX_NAME, LYNX_VERSION); - fprintf(fp0, " You have the following download choices.\n"); - fprintf(fp0, " Please select one:\n\n"); - if(!no_disk_save && !child_lynx) #ifdef DIRED_SUPPORT /* --- 618,638 ---- fprintf(fp0, "\n\n\n"); LYCloseTempFP(fp0); diff -rc lynx2-8-1.orig/src/LYHistory.c lynx2-8-1/src/LYHistory.c *** lynx2-8-1.orig/src/LYHistory.c Fri Aug 21 14:30:14 1998 --- lynx2-8-1/src/LYHistory.c Sun Aug 23 21:49:00 1998 *************** *** 406,414 **** LYAddMETAcharsetToFD(fp0, -1); fprintf(fp0, "%s \n\n\n", DOWNLOAD_OPTIONS_TITLE); + fprintf(fp0, "\ + [ jump-down ] \ + [ %s (%s) ] \ + [ Compiled with ] \ + [ Lynx Help ]
\n\n", + LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); ! fprintf(fp0, "\n \ ! Current File: %s\n \ ! Suggested File: %s%s\n", ! data_file, (lynx_save_space ? lynx_save_space : ""), sug_filename); ! fprintf(fp0, "\nStandard download options:\n", ! helpfilepath, "Lynx_users_guide.html#9"); if(!no_disk_save && !child_lynx) #ifdef DIRED_SUPPORT /* *************** *** 640,647 **** else {} #endif /* DIRED_SUPPORT */ else ! fprintf(fp0," Save to disk disabled.\n"); if (downloaders != NULL) { for (count = 0, cur_download = downloaders; cur_download != NULL; cur_download = cur_download->next, count++) { --- 647,656 ---- else {} #endif /* DIRED_SUPPORT */ else ! fprintf(fp0," Save to disk disabled.\n"); + fprintf(fp0, "\nLocal additions:\n"); + if (downloaders != NULL) { for (count = 0, cur_download = downloaders; cur_download != NULL; cur_download = cur_download->next, count++) { *************** *** 655,663 **** } } } else { ! fprintf(fp0, "\n\ ! No other download methods have been defined yet. You may define\n\ ! an unlimited number of download methods using the lynx.cfg file.\n"); } fprintf(fp0, "\n\n"); LYCloseTempFP(fp0); --- 664,675 ---- } } } else { ! fprintf(fp0, " \ ! <NONE>\n\n \ ! You may define an unlimited number of download methods.\n \ ! Please refer to the lynx.cfg file, \ ! sections 'DOWNLOAD' and 'INCLUDE'.\n", ! LYNX_CFG_FILE); } fprintf(fp0, "
", LYNX_NAME, LYNX_VERSION); ! fprintf(fp0, "You selected:\n"); for (x = nhist-1; x >= 0; x--) { /* * The number of the document in the hist stack, --- 406,418 ---- LYAddMETAcharsetToFD(fp0, -1); fprintf(fp0, "%s \n\n\n", HISTORY_PAGE_TITLE); ! fprintf(fp0, "\ ! [ jump-down ] \ ! [ %s (%s) ] \ ! [ Compiled with ] \ ! [ Lynx Help ]
\n\n", ! LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); ! fprintf(fp0, "\nYou selected:\n"); for (x = nhist-1; x >= 0; x--) { /* * The number of the document in the hist stack, diff -rc lynx2-8-1.orig/src/LYKeymap.c lynx2-8-1/src/LYKeymap.c *** lynx2-8-1.orig/src/LYKeymap.c Sat Aug 15 22:57:56 1998 --- lynx2-8-1/src/LYKeymap.c Sun Aug 23 23:48:55 1998 *************** *** 709,718 **** sprintf(buf, "\n%s \n\n\n", CURRENT_KEYMAP_TITLE); (*target->isa->put_block)(target, buf, strlen(buf)); ! ! sprintf(buf, "%s (%s Version %s)
\n", ! CURRENT_KEYMAP_TITLE, LYNX_NAME, LYNX_VERSION); (*target->isa->put_block)(target, buf, strlen(buf)); for (i = 'a'+1; i <= 'z'+1; i++) { print_binding(target, buf, i); --- 709,721 ---- sprintf(buf, "\n%s \n\n\n", CURRENT_KEYMAP_TITLE); (*target->isa->put_block)(target, buf, strlen(buf)); ! sprintf(buf, "[ %s (%s) ] ", ! LYNX_WWW, LYNX_NAME, LYNX_VERSION); (*target->isa->put_block)(target, buf, strlen(buf)); + sprintf(buf, "[ Compiled with ] \ + [ >Keystroke commands ]
\n\n", LYNX_COMPILE_OPTS, + helpfile, helpfilepath, "keystrokes/keystroke_help.html"); + (*target->isa->put_block)(target, buf, strlen(buf)); for (i = 'a'+1; i <= 'z'+1; i++) { print_binding(target, buf, i); diff -rc lynx2-8-1.orig/src/LYList.c lynx2-8-1/src/LYList.c *** lynx2-8-1.orig/src/LYList.c Sat Aug 15 22:57:56 1998 --- lynx2-8-1/src/LYList.c Sun Aug 23 21:48:06 1998 *************** *** 96,103 **** } fprintf(fp0, "%s \n\n\n", LIST_PAGE_TITLE); ! fprintf(fp0, "You have reached the List Page
\n"); ! fprintf(fp0, "%s Version %s
\n", LYNX_NAME, LYNX_VERSION); StrAllocCopy(Address, HTLoadedDocumentURL()); LYEntify(&Address, FALSE); fprintf(fp0, --- 96,107 ---- } fprintf(fp0, "%s \n\n\n", LIST_PAGE_TITLE); ! fprintf(fp0, "\ ! [ jump-down ] \ ! [ %s (%s) ] \ ! [ Compiled with ] \ ! [ Lynx Help ]
\n\n", ! LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); StrAllocCopy(Address, HTLoadedDocumentURL()); LYEntify(&Address, FALSE); fprintf(fp0, *************** *** 105,110 **** --- 109,115 ---- ((Address != NULL && *Address != '\0') ? Address : "this document:")); FREE(Address); + fprintf(fp0, "\n"); if (refs > 0) { fprintf(fp0, "<%s compact>\n", ((keypad_mode == NUMBERS_AS_ARROWS) ? "ol" : "ul")); diff -rc lynx2-8-1.orig/src/LYLocal.c lynx2-8-1/src/LYLocal.c *** lynx2-8-1.orig/src/LYLocal.c Sat Aug 15 22:57:56 1998 --- lynx2-8-1/src/LYLocal.c Sun Aug 23 23:01:56 1998 *************** *** 1688,1705 **** fprintf(fp0, "\n%s \n\n", DIRED_MENU_TITLE); ! fprintf(fp0, ! "\nFile Management Options (%s Version %s)
", ! LYNX_NAME, LYNX_VERSION); - fprintf(fp0, "Current directory is %s
\n", dir); - if (nothing_tagged) { if (strlen(path)) { ! fprintf(fp0, "Current selection is %s\n", path); } else { ! fprintf(fp0, "Nothing currently selected.
\n"); } } else { /* --- 1688,1707 ---- fprintf(fp0, "
\n%s \n\n", DIRED_MENU_TITLE); + fprintf(fp0, "\ + [ jump-down ] \ + [ %s (%s) ] \ + [ Compiled with ] \ + [ Lynx Help ]
\n\n", + LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); ! fprintf(fp0, "Current directory: %s
\n", dir); if (nothing_tagged) { if (strlen(path)) { ! fprintf(fp0, "Current selection: %s\n", path); } else { ! fprintf(fp0, "Current selection: Nothing currently selected.
\n"); } } else { /* *************** *** 1712,1718 **** char *cd = NULL; int i, m; #define NUM_TAGS_TO_WRITE 10 ! fprintf(fp0, "Current selection is %d tagged item%s", n, ((n == 1) ? ":" : "s:")); StrAllocCopy(cd, doc->address); HTUnEscapeSome(cd, "/"); --- 1714,1720 ---- char *cd = NULL; int i, m; #define NUM_TAGS_TO_WRITE 10 ! fprintf(fp0, "Current selection: %d tagged item%s", n, ((n == 1) ? ":" : "s:")); StrAllocCopy(cd, doc->address); HTUnEscapeSome(cd, "/"); diff -rc lynx2-8-1.orig/src/LYPrint.c lynx2-8-1/src/LYPrint.c *** lynx2-8-1.orig/src/LYPrint.c Sat Aug 15 22:57:56 1998 --- lynx2-8-1/src/LYPrint.c Sun Aug 23 22:24:57 1998 *************** *** 1264,1284 **** fprintf(fp0, "\n
\n%s \n\n\n", PRINT_OPTIONS_TITLE); - fprintf(fp0,"Printing Options (%s Version %s)
\n", - LYNX_NAME, LYNX_VERSION); - pages = (lines_in_file+65)/66; ! sprintf(buffer, ! " There are %d lines, or approximately %d page%s, to print.\n", ! lines_in_file, pages, (pages > 1 ? "s" : "")); fputs(buffer,fp0); if (no_print || no_disk_save || child_lynx || no_mail) ! fprintf(fp0, " Some print functions have been disabled!!!\n"); ! fprintf(fp0, " You have the following print choices.\n"); ! fprintf(fp0, " Please select one:\n\n"); if (child_lynx == FALSE && no_disk_save == FALSE && no_print == FALSE) fprintf(fp0, --- 1264,1289 ---- fprintf(fp0, "\n\n%s \n\n\n", PRINT_OPTIONS_TITLE); + fprintf(fp0, "\ + [ jump-down ] \ + [ %s (%s) ] \ + [ Compiled with ] \ + [ Lynx Help ]
\n\n", + LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); pages = (lines_in_file+65)/66; ! sprintf(buffer, "\n \ ! Current file: %s\n \ ! Number of lines: %d\n \ ! Number of pages: %d page%s (approximately)\n", ! tempfile, lines_in_file, pages, (pages > 1 ? "s" : "")); fputs(buffer,fp0); if (no_print || no_disk_save || child_lynx || no_mail) ! fprintf(fp0, " Some print functions have been disabled!\n"); ! fprintf(fp0, "\nStandard print options:\n", ! helpfilepath, "Lynx_users_guide.html#7"); if (child_lynx == FALSE && no_disk_save == FALSE && no_print == FALSE) fprintf(fp0, *************** *** 1285,1291 **** " Save to a local file\n", lines_in_file); else ! fprintf(fp0," Save to disk disabled.\n"); if (child_lynx == FALSE && no_mail == FALSE && local_host_only == FALSE) fprintf(fp0, " Mail the file\n", --- 1290,1296 ---- " Save to a local file\n", lines_in_file); else ! fprintf(fp0," Save to disk disabled.\n"); if (child_lynx == FALSE && no_mail == FALSE && local_host_only == FALSE) fprintf(fp0, " Mail the file\n", *************** *** 1300,1305 **** --- 1305,1311 ---- lines_in_file); #endif + fprintf(fp0, "\nLocal additions:\n"); for (count = 0, cur_printer = printers; cur_printer != NULL; cur_printer = cur_printer->next, count++) if (no_print == FALSE || cur_printer->always_enabled) { diff -rc lynx2-8-1.orig/src/LYShowInfo.c lynx2-8-1/src/LYShowInfo.c *** lynx2-8-1.orig/src/LYShowInfo.c Sat Aug 15 22:57:56 1998 --- lynx2-8-1/src/LYShowInfo.c Sun Aug 23 21:10:19 1998 *************** *** 75,82 **** LYAddMETAcharsetToFD(fp0, -1); fprintf(fp0, "%s \n\n\n", SHOWINFO_TITLE); ! fprintf(fp0,"You have reached the Information Page
\n"); ! fprintf(fp0,"%s Version %s
\n", LYNX_NAME, LYNX_VERSION); #ifdef DIRED_SUPPORT if (lynx_edit_mode && nlinks > 0) { --- 75,86 ---- LYAddMETAcharsetToFD(fp0, -1); fprintf(fp0, "%s \n\n\n", SHOWINFO_TITLE); ! fprintf(fp0, "\ ! [ jump-down ] \ ! [ %s (%s) ] \ ! [ Compiled with ] \ ! [ Lynx Help ]
\n\n", ! LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); #ifdef DIRED_SUPPORT if (lynx_edit_mode && nlinks > 0) { diff -rc lynx2-8-1.orig/src/LYUpload.c lynx2-8-1/src/LYUpload.c *** lynx2-8-1.orig/src/LYUpload.c Sat Aug 15 22:57:56 1998 --- lynx2-8-1/src/LYUpload.c Sun Aug 23 22:45:03 1998 *************** *** 241,253 **** fprintf(fp0, "\n%s \n\n\n", UPLOAD_OPTIONS_TITLE); ! fprintf(fp0, "Upload Options (%s Version %s)
\n", ! LYNX_NAME, LYNX_VERSION); - fputs(" You have the following upload choices.\n\n"); LYCloseTempFP(fp0);
\n", fp0); - fputs(" Please select one:
\n\n", fp0); - if (uploaders != NULL) { for (count = 0, cur_upload = uploaders; cur_upload != NULL; --- 241,256 ---- fprintf(fp0, "\n%s \n\n\n", UPLOAD_OPTIONS_TITLE); + fprintf(fp0, "\ + [ jump-down ] \ + [ %s (%s) ] \ + [ Compiled with ] \ + [ Lynx Help ]
\n\n", + LYNX_WWW, LYNX_NAME, LYNX_VERSION, LYNX_COMPILE_OPTS, helpfile); ! fprintf(fp0, "\n Upload To: %s\n", curloc); ! fputs("\nUpload options:\n", fp0); if (uploaders != NULL) { for (count = 0, cur_upload = uploaders; cur_upload != NULL; *************** *** 259,268 **** fprintf(fp0, "\n"); } } else { ! fprintf(fp0, "\n \ ! No other upload methods have been defined yet. You may define\n \ ! an unlimited number of upload methods using the lynx.cfg file.\n"); ! } fprintf(fp0, "\n\n"); LYCloseTempFP(fp0); --- 262,273 ---- fprintf(fp0, "\n"); } } else { ! fprintf(fp0, " \ ! <NONE>\n\n \ ! You may define an unlimited number of upload methods.\n \ ! Please refer to the lynx.cfg file, \ ! sections 'UPLOAD' and 'INCLUDE'.\n", ! LYNX_CFG_FILE); } fprintf(fp0, "