about summary refs log tree commit diff stats
path: root/src/LYMainLoop.c
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>1998-08-06 13:04:14 -0400
committerThomas E. Dickey <dickey@invisible-island.net>1998-08-06 13:04:14 -0400
commitd7e8d7e419ae58610a9988ff09910670a59526ff (patch)
treea7c02ce435a282a5f60b1a297b5dd4d053b92d67 /src/LYMainLoop.c
parente6ba2a01f70f84d9133cf305e4b493c9d656cb21 (diff)
downloadlynx-snapshots-d7e8d7e419ae58610a9988ff09910670a59526ff.tar.gz
snapshot of project "lynx", label v2-8-1dev_20
Diffstat (limited to 'src/LYMainLoop.c')
-rw-r--r--src/LYMainLoop.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index a232be02..b00b039b 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,4 @@
 #include <HTUtils.h>
-#include <tcp.h>
 #include <HTAccess.h>
 #include <HTParse.h>
 #include <HTList.h>
@@ -84,8 +83,6 @@ PRIVATE int sametext ARGS2(
 }
 #endif /* FASTTAB */
 
-#define FREE(x) if (x) {free(x); x = NULL;}
-
 PUBLIC	HTList * Goto_URLs = NULL;  /* List of Goto URLs */
 
 PUBLIC char * LYRequestTitle = NULL; /* newdoc.title in calls to getfile() */
@@ -234,7 +231,9 @@ int mainloop NOARGS
     char *temp = NULL;
     BOOLEAN ForcePush = FALSE;
     BOOLEAN override_LYresubmit_posts = FALSE;
+#ifdef EXP_FORMS_OPTIONS
     BOOLEAN was_in_options = FALSE;
+#endif
     unsigned int len;
     int i;
 
@@ -382,11 +381,12 @@ try_again:
 		     *	under case NORMAL.  - FM
 		     */
 #ifndef EXP_FORMS_OPTIONS
-		    if (strncmp(newdoc.address, "LYNXDOWNLOAD:", 13)) {
+		    if (strncmp(newdoc.address, "LYNXDOWNLOAD:", 13))
 #else /* EXP_FORMS_OPTIONS */
 		    if (strncmp(newdoc.address, "LYNXDOWNLOAD:", 13) &&
-			strncmp(newdoc.address, "LYNXOPTIONS:", 12)) {
+			strncmp(newdoc.address, "LYNXOPTIONS:", 12))
 #endif /* EXP_FORMS_OPTIONS */
+		    {
 			LYpush(&curdoc, ForcePush);
 		    }
 		} else if (!newdoc.address) {
@@ -3818,7 +3818,7 @@ check_goto_URL:
 	    c = dir_list_style;
 #endif /* DIRED_SUPPORT */
 #ifndef EXP_FORMS_OPTIONS
-	    options(); /* do the options stuff */
+	    LYoptions(); /* do the options stuff */
 
 	    if (keypad_mode_flag != keypad_mode ||
 		(user_mode_flag != user_mode &&
@@ -4302,7 +4302,7 @@ check_goto_URL:
 			    _statusline(NO_STATUS);
 			    sleep(AlertSecs);
 			} else {
-			    if (((dir_info.st_mode) & S_IFMT) == S_IFREG) {
+			    if (S_ISREG(dir_info.st_mode)) {
 				StrAllocCopy(tp, cp);
 				HTUnEscapeSome(tp, "/");
 				if (edit_current_file(tp,
@@ -4616,7 +4616,7 @@ check_goto_URL:
 		} else {
 		    char *VMSdir = NULL;
 
-		    if (((stat_info.st_mode) & S_IFMT) == S_IFDIR) {
+		    if (S_ISDIR(stat_info.st_mode)) {
 			/*
 			 *  We're viewing a local directory.  Make
 			 *  that the CSwing argument. - FM