about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/GridText.c4
-rw-r--r--src/LYCookie.c12
-rw-r--r--src/LYCurses.c3
-rw-r--r--src/LYDownload.c10
-rw-r--r--src/LYGlobalDefs.h7
-rw-r--r--src/LYMail.c4
-rw-r--r--src/LYMain.c1
-rw-r--r--src/LYMainLoop.c1
-rw-r--r--src/LYPrint.c7
-rw-r--r--src/LYReadCFG.c3
-rw-r--r--src/LYSignal.h2
-rw-r--r--src/LYUpload.c8
-rw-r--r--src/LYUtils.c3
13 files changed, 34 insertions, 31 deletions
diff --git a/src/GridText.c b/src/GridText.c
index 098e45e0..02986757 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -189,7 +189,7 @@ struct _HText {
 				S_nonascii_text, S_dollar_paren,
 				S_jisx0201_text }
 				state;			/* Escape sequence? */
-	char			kanji_buf;		/* Lead multibyte */
+	int			kanji_buf;		/* Lead multibyte */
 	int			in_sjis;		/* SJIS flag */
 	int			halted; 		/* emergency halt */
 
@@ -2263,7 +2263,7 @@ PUBLIC void HText_appendCharacter ARGS2(
 					(unsigned char *)&kb,
 					(unsigned char *)&c);
 		    ch = (char)c;
-		    text->kanji_buf = (char)kb;
+		    text->kanji_buf = kb;
 		} else {
 		    text->kanji_buf = ch;
 		    /*
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 716c69ef..e7a3d822 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -1856,6 +1856,7 @@ PUBLIC void LYLoadCookies ARGS1 (
 
     while (!feof(cookie_handle)) {
 	cookie *moo;
+	unsigned i = 0;
 	int tok_loop;
 	char *tok_out, *tok_ptr;
 	char *j;
@@ -1866,6 +1867,17 @@ PUBLIC void LYLoadCookies ARGS1 (
 	    continue;
 	}
 
+
+	/*
+	 * Strip out the newline that fgets() puts at the end of a
+	 * cookie.
+	 */
+
+	while(buf[i] != '\n' && i < sizeof(buf)) {
+	    i++;
+	}
+	buf[i] = '\0';
+
 	/*
 	 * Tokenise the cookie line into its component parts -
 	 * this only works for Netscape style cookie files at the
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 1f066b62..0935182c 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,5 @@
 #include <HTUtils.h>
+#include <HTAlert.h>
 #include <LYCurses.h>
 #include <LYStyle.h>
 #include <LYUtils.h>
@@ -933,7 +934,7 @@ PUBLIC BOOLEAN setup ARGS1(
 {
     int c;
     int status;
-    char *dummy, *cp, term[81];
+    char *dummy = 0, *cp, term[81];
 #ifdef USE_SLANG
     extern void longname();
 #endif /* USE_SLANG */
diff --git a/src/LYDownload.c b/src/LYDownload.c
index db42b431..af02fe41 100644
--- a/src/LYDownload.c
+++ b/src/LYDownload.c
@@ -647,16 +647,8 @@ PUBLIC int LYdownload_options ARGS2(
 		fprintf(fp0,"</a>\n");
 	    }
 	}
-    } else {
-	fprintf(fp0, "   \
-&lt;NONE&gt;\n\n   \
-<!-- \
-You may define an unlimited number of download methods.\n   \
-Please refer to the <a href=\"%s\">lynx.cfg</a> file, \
-sections 'DOWNLOAD' and 'INCLUDE'. \
---> \n",
-	LYNX_CFG_FILE);
     }
+
     fprintf(fp0, "</pre>\n");
     EndInternalPage(fp0);
     LYCloseTempFP(fp0);
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index 6852a5d6..75a24be2 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -231,7 +231,6 @@ extern BOOLEAN local_host_only;
 extern BOOLEAN override_no_download;
 extern BOOLEAN show_dotfiles;	/* From rcfile if no_dotfiles is false */
 extern char *indexfile;
-extern int outgoing_mail_charset; /* translate outgoing mail to this charset */
 extern char *personal_mail_address;
 extern char *homepage;	      /* startfile or command line argument */
 extern char *editor;          /* if non empty it enables edit mode with
@@ -264,6 +263,7 @@ extern int Newline_partial;          /* -//- "current" newline position */
 extern int NumOfLines_partial;       /* -//- "current" number of lines */
 extern BOOLEAN debug_display_partial;  /* show with MessageSecs delay */
 extern BOOLEAN detected_forms_input_partial; /* trimHightext temp fix */
+extern int min_lines_partial; /* incremental rendering minimum */
 #endif
 extern char *form_post_data;         /* User data for post form */
 extern char *form_get_data;          /* User data for get form */
@@ -294,12 +294,15 @@ extern BOOLEAN LYNoFromHeader;		/* Never send From header?    */
 extern BOOLEAN LYListNewsNumbers;
 extern BOOLEAN LYUseMouse;
 extern BOOLEAN LYListNewsDates;
+
 extern BOOLEAN LYRawMode;
 extern BOOLEAN LYDefaultRawMode;
 extern BOOLEAN LYUseDefaultRawMode;
 extern char *UCAssume_MIMEcharset;
 extern BOOLEAN UCSaveBookmarksInUnicode; /* in titles,  chars >127 save as &#xUUUU */
 extern BOOLEAN UCForce8bitTOUPPER; /* disable locale case-conversion for >127 */
+extern int outgoing_mail_charset; /* translate outgoing mail to this charset */
+
 extern BOOLEAN LYisConfiguredForX;
 extern char *URLDomainPrefixes;
 extern char *URLDomainSuffixes;
@@ -327,8 +330,6 @@ extern int LYHiddenLinks;
 
 extern BOOL New_DTD;
 
-#define BOOKMARK_TITLE "Bookmark file"
-#define MOSAIC_BOOKMARK_TITLE "Converted Mosaic Hotlist"
 #define MBM_V_MAXFILES  25		/* Max number of sub-bookmark files */
 /*
  *  Arrays that holds the names of sub-bookmark files
diff --git a/src/LYMail.c b/src/LYMail.c
index d61413d5..62e9a8d7 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -602,8 +602,8 @@ PUBLIC void mailmsg ARGS4(
     char hdrfile[256];
     FILE *hfd;
 
-    CTRACE(tfp, "mailmsg(%d, \"%s\", \"%s\", \"%s\")\n",cur,
-	cur, owner_address?owner_address:"<nil>",
+    CTRACE(tfp, "mailmsg(%d, \"%s\", \"%s\", \"%s\")\n", cur,
+	owner_address?owner_address:"<nil>",
 	filename?filename:"<nil>",
 	linkname?linkname:"<nil>");
 
diff --git a/src/LYMain.c b/src/LYMain.c
index 6e030201..9747cb11 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -360,6 +360,7 @@ PUBLIC BOOLEAN LYQuitDefaultYes = QUIT_DEFAULT_YES;
 PUBLIC BOOLEAN display_partial = TRUE; /* Display document during download */
 PUBLIC BOOLEAN debug_display_partial = FALSE; /* Show with MessageSecs delay */
 PUBLIC BOOLEAN detected_forms_input_partial = FALSE; /* trimHightext temp fix */
+PUBLIC int min_lines_partial = 0; /* default: wait for complete screen */
 #endif
 
 /* These are declared in cutil.h for current freeWAIS libraries. - FM */
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index e3955e42..e5b44d62 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -986,7 +986,6 @@ try_again:
 
 			/*
 			 *  End of incremental rendering stage here.
-			 *  Reset for debugging purpose only.
 			 */
 			display_partial = FALSE;
 		    }
diff --git a/src/LYPrint.c b/src/LYPrint.c
index 4a4a86bf..91fd2f82 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -63,7 +63,7 @@
 PRIVATE int remove_quotes PARAMS((char *string));
 #endif /* VMS */
 
-PRIVATE  CONST char* subject_translate8bit PARAMS((char *source));
+PRIVATE  char* subject_translate8bit PARAMS((char *source));
 
 PUBLIC int printfile ARGS1(
 	document *,	newdoc)
@@ -93,7 +93,7 @@ PUBLIC int printfile ARGS1(
     HTAtom *encoding;
     BOOL use_mime, use_cte, use_type;
     CONST char *disp_charset;
-    CONST char *subject;   /* print-to-email */
+    char *subject = NULL;   /* print-to-email */
     static BOOLEAN first_mail_preparsed = TRUE;
     char *envbuffer = NULL;
 #ifdef VMS
@@ -1204,6 +1204,7 @@ PUBLIC int printfile ARGS1(
 
     FREE(link_info);
     FREE(sug_filename);
+    FREE(subject);
     FREE(content_base);
     FREE(content_location);
     return(NORMAL);
@@ -1240,7 +1241,7 @@ PRIVATE int remove_quotes ARGS1(
  *  lynx character handler, -1 for no translation (so display charset).
  *
  */
-PRIVATE  CONST char* subject_translate8bit ARGS1(char *, source)
+PRIVATE char* subject_translate8bit ARGS1(char *, source)
 {
     CONST char *p = source;
     char temp[256];
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 20a9d380..23f9b5e6 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -903,6 +903,7 @@ static Config_Type Config_Table [] =
      PARSE_FUN("outgoing_mail_charset", CONF_FUN, outgoing_mail_charset_fun),
 #ifdef DISP_PARTIAL
      PARSE_SET("partial", CONF_BOOL, display_partial),
+     PARSE_SET("partial_min_lines", CONF_INT, min_lines_partial),
 #endif
      PARSE_STR("personal_mailcap", CONF_STR, personal_type_map),
      PARSE_STR("personal_extension_map", CONF_STR, personal_extension_map),
@@ -1135,7 +1136,7 @@ PUBLIC void read_cfg ARGS4(
 
 	    if (getenv (name) == 0) {
 #ifdef VMS
-		Define_VMSLogical(tbl->name, value);
+		Define_VMSLogical(name, value);
 #else
 		char tmpbuf[MAX_LINE_BUFFER_LEN];
 		sprintf (tmpbuf, "%s=%s", name, value);
diff --git a/src/LYSignal.h b/src/LYSignal.h
index 9db40918..d8b1d106 100644
--- a/src/LYSignal.h
+++ b/src/LYSignal.h
@@ -5,7 +5,7 @@
 #include <signal.h>
 
 #ifdef VMS
-extern void *VMSsignal PARAMS((int sig, void (*func)()));
+extern void VMSsignal PARAMS((int sig, void (*func)()));
 #ifdef signal
 #undef signal
 #endif /* signal */
diff --git a/src/LYUpload.c b/src/LYUpload.c
index b07c6818..825d0e19 100644
--- a/src/LYUpload.c
+++ b/src/LYUpload.c
@@ -250,13 +250,9 @@ PUBLIC int LYUpload_options ARGS2(
 	    fprintf(fp0, "</a>\n");
 	}
     } else {
-	fprintf(fp0, "   \
-&lt;NONE&gt;\n\n   \
-You may define an unlimited number of upload methods.\n   \
-Please refer to the <a href=\"%s\">lynx.cfg</a> file, \
-sections 'UPLOAD' and 'INCLUDE'.\n",
-	LYNX_CFG_FILE);
+	fprintf(fp0, "   &lt;NONE&gt;\n");
     }
+
     fprintf(fp0, "</pre>\n");
     EndInternalPage(fp0);
     LYCloseTempFP(fp0);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index eaf79dad..ac6055f6 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -5803,11 +5803,10 @@ PUBLIC void LYRemoveTemp ARGS1(
 		} else {
 		    ly_temp = p->next;
 		}
+		code = remove(name);
 #ifdef VMS
 		while (remove(name) == 0)
 		    ;
-#else
-		code = remove(name);
 #endif
 		CTRACE(tfp, "...LYRemoveTemp done(%d)%s\n", code,
 		       (p->file != 0) ? ", closed" : "");
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-03-04 23:06:11 +0000