diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2000-05-05 14:20:01 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2000-05-05 14:20:01 -0400 |
| commit | 7887ed244553feb87fbae9a1c84b95d970e2f13a (patch) | |
| tree | bfbb6e4135d55089afd5c231ecb9786b5fed649f /src | |
| parent | 4495b73b691d8f3037361f55f08fc37abc9f2b08 (diff) | |
| download | lynx-snapshots-7887ed244553feb87fbae9a1c84b95d970e2f13a.tar.gz | |
snapshot of project "lynx", label v2-8-4dev_1
Diffstat (limited to 'src')
| -rw-r--r-- | src/LYClean.c | 2 | ||||
| -rw-r--r-- | src/LYCurses.c | 2 | ||||
| -rw-r--r-- | src/LYGetFile.c | 11 | ||||
| -rw-r--r-- | src/LYUtils.c | 4 | ||||
| -rw-r--r-- | src/LYexit.c | 2 |
5 files changed, 12 insertions, 9 deletions
diff --git a/src/LYClean.c b/src/LYClean.c index c7eb4815..216b1618 100644 --- a/src/LYClean.c +++ b/src/LYClean.c @@ -43,7 +43,6 @@ PUBLIC void cleanup_sig ARGS1( * Reassert the AST. */ (void) signal(SIGINT, cleanup_sig); - HadVMSInterrupt = TRUE; if (!LYCursesON) return; @@ -61,6 +60,7 @@ PUBLIC void cleanup_sig ARGS1( } else { c = HTConfirmDefault(REALLY_EXIT_N, NO); } + HadVMSInterrupt = TRUE; if (LYQuitDefaultYes == TRUE) { if (c == NO) { return; diff --git a/src/LYCurses.c b/src/LYCurses.c index 75727790..4717f9f7 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -1356,7 +1356,7 @@ PUBLIC void LYtouchline ARGS1( #if defined(HAVE_WREDRAWLN) wredrawln(stdscr, row, 1); #else -#if defined(VMS) && !defined(_BSD44_CURSES) +#if defined(VMS) && !defined(_BSD44_CURSES) && !defined(USE_SLANG) /* touchline() is not available on VMS before version 7.0, and then * only on Alpha, since prior ports of curses were broken. */ diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 0ac77c47..a1289c36 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -1055,11 +1055,14 @@ Try_Redirected_URL: return(NULLFILE); } else { - /* - * May set www_search_result. - */ - if (pound != NULL) + if (pound != NULL) { + if (!HTMainText) /* this should not happen... */ + return(NULLFILE); /* but it can. - kw */ + /* + * May set www_search_result. + */ HTFindPoundSelector(pound+1); + } return(NORMAL); } } diff --git a/src/LYUtils.c b/src/LYUtils.c index 89008bcc..89767250 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -7044,7 +7044,7 @@ PUBLIC BOOLEAN LYValidateFilename ARGS2( #else #ifndef __EMX__ - if (!LYIsPathSep(*given)) { + if (!LYisAbsPath(given)) { #if defined(__DJGPP__) || defined(_WINDOWS) if (strchr(result, ':') != NULL) cp = NULL; @@ -7331,7 +7331,7 @@ PUBLIC int LYCopyFile ARGS2( char *, src, char *, dst) { -#if defined(DOSPATH) /* thanks to Hiroyuki Senshu */ +#if defined(DOSPATH) || defined(__CYGWIN__) /* thanks to Hiroyuki Senshu */ #define BUF_SIZE 1024 diff --git a/src/LYexit.c b/src/LYexit.c index cc1d2b9a..3a1adacf 100644 --- a/src/LYexit.c +++ b/src/LYexit.c @@ -8,9 +8,9 @@ #include <LYGlobalDefs.h> #include <LYUtils.h> #include <LYSignal.h> -#include <LYClean.h> #include <LYMainLoop.h> #endif /* !VMS */ +#include <LYClean.h> /* * Flag for outofmem macro. - FM |