home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Spezial
/
SPEZIAL2_97.zip
/
SPEZIAL2_97.iso
/
ANWEND
/
ONLINE
/
OS2LYN_1
/
PATCHES.OS2
< prev
next >
Wrap
Text File
|
1997-07-12
|
37KB
|
1,227 lines
diff -cr -X exclude old/Makefile new/Makefile
*** old/Makefile Thu Apr 3 07:55:28 1997
--- new/Makefile Sat Jul 12 10:02:52 1997
***************
*** 1,9 ****
##makefile for lynx
! SHELL = /bin/sh
##uncomment the next line if your make fails to set $(MAKE)
! #MAKE= make
##this is the name of the directory the lynx source code is in.
##(e.g. lynx2-7-1, not the full path)
--- 1,9 ----
##makefile for lynx
! SHELL = sh.exe
##uncomment the next line if your make fails to set $(MAKE)
! MAKE= d:/gnu/bin/make
##this is the name of the directory the lynx source code is in.
##(e.g. lynx2-7-1, not the full path)
***************
*** 111,117 ****
# or modified at run time via DIRED_MENU symbols in lynx.cfg.
#
# To disable DirEd completely, prepend "#" to this line:
! DIRED_SUPPORT = -DDIRED_SUPPORT
#(If you have disabled DirEd completely, you can ignore all the
#other DirEd stuff here.)
#
--- 111,117 ----
# or modified at run time via DIRED_MENU symbols in lynx.cfg.
#
# To disable DirEd completely, prepend "#" to this line:
! #DIRED_SUPPORT = -DDIRED_SUPPORT
#(If you have disabled DirEd completely, you can ignore all the
#other DirEd stuff here.)
#
***************
*** 731,736 ****
--- 731,745 ----
SLANGLIB="$(SLANGLIB) $(SLANGRRLIB) -lslang -lm" \
SLANGINC="$(SLANGINC)"
+ os2:
+ cd WWW/Library/unix; $(MAKE) CC="gcc" LYFLAGS="-DOS2 $(SITE_LYDEFS)"
+ cd src; $(MAKE) os2 CC="gcc" MCFLAGS="-O -DOS2 -DNCURSES \
+ -DFANCY_CURSES -DNO_TTYTYPE \
+ -I/emx/include/ncurses -I../$(WWWINC) $(SITE_DEFS)" \
+ LIBS=" -lform -lmenu -lpanel -lncurses -lsocket \
+ $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS)" \
+ WWWLIB="../WWW/Library/unix/libwww.a"
+
osf:
cd WWW/Library/osf; $(MAKE) LYFLAGS="-Olimit 2000 $(SITE_LYDEFS)"
cd src; $(MAKE) all CC="cc" MCFLAGS="-O -Olimit 4000 -DUNIX \
*** old/src/HTFWriter.c Wed Mar 26 11:56:28 1997
--- new/src/HTFWriter.c Wed May 21 20:25:40 1997
***************
*** 200,206 ****
--- 200,210 ----
* for the uncompressed file and invoke
* HTLoadFile() to handle it. - FM
*/
+ #ifdef OS2
+ StrAllocCopy (addr, "file://localhost/");
+ #else
StrAllocCopy(addr, "file://localhost");
+ #endif /* OS2 */
#ifdef VMS
StrAllocCat(addr, HTVMS_wwwName(path));
#else
diff -cr -X exclude old/src/LYBookmark.c new/src/LYBookmark.c
*** old/src/LYBookmark.c Thu Feb 6 16:32:08 1997
--- new/src/LYBookmark.c Mon May 19 17:27:26 1997
***************
*** 119,125 ****
--- 119,129 ----
sprintf(URL_buffer,"file://localhost%s",
HTVMS_wwwName((char *)newname));
#else
+ #ifdef OS2
+ sprintf(URL_buffer,"file://localhost/%s",newname);
+ #else
sprintf(URL_buffer,"file://localhost%s", newname);
+ #endif /* OS2 */
#endif /* VMS */
} else {
fclose(fp);
***************
*** 128,134 ****
--- 132,142 ----
sprintf(URL_buffer,"file://localhost%s",
HTVMS_wwwName((char *)filename_buffer));
#else
+ #ifdef OS2
+ sprintf(URL_buffer,"file://localhost/%s",filename_buffer);
+ #else
sprintf(URL_buffer,"file://localhost%s", filename_buffer);
+ #endif /* OS2 */
#endif /* VMS */
}
diff -cr -X exclude old/src/LYCgi.c new/src/LYCgi.c
*** old/src/LYCgi.c Sat Dec 7 16:49:54 1996
--- new/src/LYCgi.c Thu May 22 14:16:48 1997
***************
*** 162,167 ****
--- 162,170 ----
StrAllocCopy(temp, pgm);
StrAllocCopy(new_arg, "file://localhost");
+ #ifdef OS2
+ StrAllocCat(new_arg, "/");
+ #endif /* OS2 */
StrAllocCat(new_arg, temp);
if (TRACE) {
diff -cr -X exclude old/src/LYDownload.c new/src/LYDownload.c
*** old/src/LYDownload.c Sun Sep 1 20:24:10 1996
--- new/src/LYDownload.c Mon May 19 18:16:46 1997
***************
*** 218,223 ****
--- 218,230 ----
strcpy(buffer, command);
}
#else
+ #ifdef OS2
+ cp = NULL;
+ if (cp) {
+ sprintf(command, "%s/%s", cp, buffer);
+ strcpy(buffer, command);
+ }
+ #else
if (*buffer != '/')
cp = getenv("PWD");
else
***************
*** 226,231 ****
--- 233,239 ----
sprintf(command,"%s/%s", cp, buffer);
strcpy(buffer, command);
}
+ #endif /* OS2 */
#endif /* VMS */
/* see if it already exists */
***************
*** 297,302 ****
--- 305,317 ----
*/
LYDidRename = TRUE;
}
+ #else
+ #ifdef OS2
+ sprintf(command, "%s %s %s", COPY_PATH, file, buffer);
+ if (TRACE)
+ fprintf(stderr, "FAILED!\ncommand: %s\n", command);
+ system(command);
+
#else /* Unix: */
/*
* Prevent spoofing of the shell.
***************
*** 307,312 ****
--- 322,328 ----
if (TRACE)
fprintf(stderr,"command: %s\n",command);
system(command);
+ #endif /* OS2 */
#endif /* VMS */
} else {
***************
*** 535,541 ****
--- 551,561 ----
#ifdef VMS
sprintf(download_filename,"file://localhost/%s",tempfile);
#else
+ #ifdef OS2
+ sprintf(download_filename,"file://localhost/%s",tempfile);
+ #else
sprintf(download_filename,"file://localhost%s",tempfile);
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCopy(*newfile, download_filename);
LYforce_no_cache = TRUE; /* don't cache this doc */
diff -cr -X exclude old/src/LYEdit.c new/src/LYEdit.c
*** old/src/LYEdit.c Thu Feb 6 16:32:50 1997
--- new/src/LYEdit.c Mon May 19 18:46:26 1997
***************
*** 66,74 ****
#ifdef VMS
if ((fp = fopen(HTVMS_name("",filename),"r")) == NULL) {
#else
if ((fp = fopen(filename,"r")) == NULL) {
-
#endif /* VMS */
HTAlert(COULD_NOT_ACCESS_FILE);
FREE(filename);
goto failure;
--- 66,80 ----
#ifdef VMS
if ((fp = fopen(HTVMS_name("",filename),"r")) == NULL) {
#else
+ #ifdef OS2
+ sscanf(filename, "/%s", filename); /* Drop any leading slash */
+ #endif /* OS2 */
if ((fp = fopen(filename,"r")) == NULL) {
#endif /* VMS */
+ #ifdef OS2
+ if (TRACE)
+ fprintf(stderr, "Bogus filename: %s\n", filename);
+ #endif /* OS2 */
HTAlert(COULD_NOT_ACCESS_FILE);
FREE(filename);
goto failure;
diff -cr -X exclude old/src/LYGlobalDefs.h new/src/LYGlobalDefs.h
*** old/src/LYGlobalDefs.h Sun Feb 9 04:38:14 1997
--- new/src/LYGlobalDefs.h Wed May 14 17:38:56 1997
***************
*** 15,20 ****
--- 15,25 ----
#include "LYStructs.h"
#endif /* LYSTRUCTS_H */
+ #ifdef OS2 /* Drive letter support for OS/2 */
+ #define getcwd _getcwd2
+ #define chdir _chdir2
+ #endif /* OS2 */
+
#ifdef SOCKS
extern BOOLEAN socks_flag;
#endif /* SOCKS */
diff -cr -X exclude old/src/LYHistory.c new/src/LYHistory.c
*** old/src/LYHistory.c Fri Apr 4 07:10:58 1997
--- new/src/LYHistory.c Wed May 21 20:11:24 1997
***************
*** 314,320 ****
--- 314,324 ----
#ifdef VMS
sprintf(hist_filename,"file://localhost/%s", tempfile);
#else
+ #ifdef OS2
+ sprintf(hist_filename,"file://localhost/%s",tempfile);
+ #else
sprintf(hist_filename,"file://localhost%s", tempfile);
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCopy(*newfile, hist_filename);
LYforce_HTML_mode = TRUE; /* force this file to be HTML */
***************
*** 456,462 ****
--- 460,470 ----
#ifdef VMS
sprintf(vl_filename,"file://localhost/%s", tempfile);
#else
+ #ifdef OS2
+ sprintf(vl_filename,"file://localhost/%s", tempfile);
+ #else
sprintf(vl_filename,"file://localhost%s", tempfile);
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCopy(*newfile, vl_filename);
LYforce_HTML_mode = TRUE; /* force this file to be HTML */
diff -cr -X exclude old/src/LYList.c new/src/LYList.c
*** old/src/LYList.c Wed Aug 28 16:44:42 1996
--- new/src/LYList.c Mon May 19 17:56:08 1997
***************
*** 72,78 ****
--- 72,82 ----
#ifdef VMS
sprintf(list_filename, "file://localhost/%s", tempfile);
#else
+ #ifdef OS2
+ sprintf(list_filename, "file://localhost/%s",tempfile);
+ #else
sprintf(list_filename, "file://localhost%s", tempfile);
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCopy(*newfile, list_filename);
LYforce_HTML_mode=TRUE; /* force this file to be HTML */
diff -cr -X exclude old/src/LYLocal.c new/src/LYLocal.c
*** old/src/LYLocal.c Fri Mar 21 11:06:16 1997
--- new/src/LYLocal.c Thu May 22 14:56:20 1997
***************
*** 39,44 ****
--- 39,48 ----
#include "LYLeaks.h"
+ #ifdef OS2
+ #define lstat(x, y) fstat(x, y)
+ #endif /* OS2 */
+
#define FREE(x) if (x) {free(x); x = NULL;}
PRIVATE int my_spawn PARAMS((char *path, char **argv, char *msg));
***************
*** 877,888 ****
sprintf(tmpbuf,"Remove file %s (y or n): ",cp);
else
sprintf(tmpbuf,"Remove file (y or n): ");
! } else if ((dir_info.st_mode & S_IFMT) == S_IFLNK) {
! if(strlen(cp) < 50)
! sprintf(tmpbuf,"Remove symbolic link %s (y or n): ",cp);
else
sprintf(tmpbuf,"Remove symbolic link (y or n): ");
! } else {
sprintf(tmpbuf,"Unable to determine status of %s. ",testpath);
_statusline(tmpbuf);
sleep(AlertSecs);
--- 881,896 ----
sprintf(tmpbuf,"Remove file %s (y or n): ",cp);
else
sprintf(tmpbuf,"Remove file (y or n): ");
! }
! #ifndef OS2
! else if ((dir_info.st_mode & S_IFMT) == S_IFLNK) {
! if(strlen(cp) < 50)
! sprintf(tmpbuf,"Remove symbolic link %s (y or n): ",cp);
else
sprintf(tmpbuf,"Remove symbolic link (y or n): ");
! }
! #endif /*! OS2 */
! else {
sprintf(tmpbuf,"Unable to determine status of %s. ",testpath);
_statusline(tmpbuf);
sleep(AlertSecs);
diff -cr -X exclude old/src/LYMain.c new/src/LYMain.c
*** old/src/LYMain.c Fri Apr 4 07:11:22 1997
--- new/src/LYMain.c Thu May 15 10:20:56 1997
***************
*** 691,697 ****
(cp=getenv("lynx_cfg")) != NULL)
StrAllocCopy(lynx_cfg_file, cp);
}
!
/*
* If we still don't have a configuration file,
* use the userdefs.h definition.
--- 691,710 ----
(cp=getenv("lynx_cfg")) != NULL)
StrAllocCopy(lynx_cfg_file, cp);
}
! #ifdef OS2
! /* On OS/2, look for the configuration file in $ETC, usually
! c:\mptn\etc, but who knows? This doesn't work so well, and
! conflicts with djd's lynx port, so I'm going to leave it out.
! JFM
! */
!
! /* if ((cp=getenv("ETC")) !=NULL) { */
! /* sprintf(cp,"%s/lynx.cfg", cp); */
! /* StrAllocCopy(lynx_cfg_file, cp); */
! /* } */
!
! #endif /*OS2*/
!
/*
* If we still don't have a configuration file,
* use the userdefs.h definition.
diff -cr -X exclude old/src/LYMainLoop.c new/src/LYMainLoop.c
*** old/src/LYMainLoop.c Fri Mar 28 08:14:16 1997
--- new/src/LYMainLoop.c Wed May 14 16:45:28 1997
***************
*** 3600,3609 ****
--- 3600,3613 ----
stop_curses();
printf(SPAWNING_MSG);
fflush(stdout);
+ #ifdef OS2
+ system(getenv("COMSPEC"));
+ #else
#ifdef VMS
system("");
#else
system("exec $SHELL");
+ #endif /* OS2 */
#endif /* VMS */
start_curses();
refresh_screen=TRUE; /* for a showpage */
diff -cr -X exclude old/src/LYPrint.c new/src/LYPrint.c
*** old/src/LYPrint.c Fri Mar 21 11:06:36 1997
--- new/src/LYPrint.c Mon May 19 20:00:28 1997
***************
*** 934,940 ****
--- 934,944 ----
#ifdef VMS
StrAllocCopy(print_filename, "file://localhost/");
#else
+ #ifdef OS2
+ StrAllocCopy(print_filename, "file://localhost/");
+ #else
StrAllocCopy(print_filename, "file://localhost");
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCat(print_filename, tempfile);
diff -cr -X exclude old/src/LYShowInfo.c new/src/LYShowInfo.c
*** old/src/LYShowInfo.c Sun Mar 2 12:45:22 1997
--- new/src/LYShowInfo.c Wed May 21 20:11:00 1997
***************
*** 22,27 ****
--- 22,31 ----
#include "LYLocal.h"
#endif /* DIRED_SUPPORT */
+ #ifdef OS2
+ #define lstat(x, y) fstat(x, y)
+ #endif /* OS2 */
+
#define FREE(x) if (x) {free(x); x = NULL;}
/*
***************
*** 65,71 ****
--- 69,79 ----
#ifdef VMS
StrAllocCopy(info_url,"file://localhost/");
#else
+ #ifdef OS2
+ StrAllocCopy(info_url, "file://localhost/");
+ #else
StrAllocCopy(info_url,"file://localhost");
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCat(info_url,tempfile);
***************
*** 131,144 ****
} else if (((dir_info.st_mode) & S_IFMT) == S_IFREG) {
fprintf(fp0,
"\nFile that you have currently selected\n\n");
! } else if (((dir_info.st_mode) & S_IFMT) == S_IFLNK) {
! fprintf(fp0,
! "\nSymbolic link that you have currently selected\n\n");
! } else {
fprintf(fp0,
"\nItem that you have currently selected\n\n");
}
fprintf(fp0," <em>Full name:</em> %s\n", temp);
if (((dir_info.st_mode) & S_IFMT) == S_IFLNK) {
char buf[1025];
int buf_size;
--- 139,157 ----
} else if (((dir_info.st_mode) & S_IFMT) == S_IFREG) {
fprintf(fp0,
"\nFile that you have currently selected\n\n");
! }
! #ifndef OS2
! else if (((dir_info.st_mode) & S_IFMT) == S_IFLNK) {
! fprintf(fp0,
! "\nSymbolic link that you have currently selected\n\n");
! }
! #endif /* !OS2 */
! else {
fprintf(fp0,
"\nItem that you have currently selected\n\n");
}
fprintf(fp0," <em>Full name:</em> %s\n", temp);
+ #ifndef OS2
if (((dir_info.st_mode) & S_IFMT) == S_IFLNK) {
char buf[1025];
int buf_size;
***************
*** 150,155 ****
--- 163,169 ----
}
fprintf(fp0, " <em>Points to file:</em> %s\n", buf);
}
+ #endif /* !OS2 */
pw = getpwuid(dir_info.st_uid);
if (pw)
fprintf(fp0, " <em>Name of owner:</em> %s\n", pw->pw_name);
***************
*** 225,232 ****
--- 239,248 ----
strcat(modes, ", search");
else {
strcat(modes, ", execute");
+ #ifndef OS2
if ((dir_info.st_mode & S_ISVTX))
strcat(modes, ", sticky");
+ #endif /* !OS2 */
}
}
fprintf(fp0, "%s\n", (char *)&modes[2]); /* Skip leading ', ' */
diff -cr -X exclude old/src/LYUpload.c new/src/LYUpload.c
*** old/src/LYUpload.c Tue Jul 16 17:22:30 1996
--- new/src/LYUpload.c Mon May 19 18:07:04 1997
***************
*** 160,166 ****
}
/* see if we can write to it */
-
if((fp = fopen(buffer,"w")) != NULL) {
fclose(fp);
remove(buffer);
--- 160,165 ----
***************
*** 258,264 ****
--- 257,267 ----
#ifdef VMS
sprintf(upload_filename,"file://localhost/%s",tempfile);
#else
+ #ifdef OS2
+ sprintf(upload_filename,"file://localhost/%s",tempfile);
+ #else
sprintf(upload_filename,"file://localhost%s",tempfile);
+ #endif /* OS2 */
#endif /* VMS */
StrAllocCopy(*newfile, upload_filename);
diff -cr -X exclude old/src/LYUtils.c new/src/LYUtils.c
*** old/src/LYUtils.c Mon Mar 31 09:28:36 1997
--- new/src/LYUtils.c Mon May 19 16:30:18 1997
***************
*** 32,37 ****
--- 32,41 ----
#endif /* UTMPX_FOR_UTMP */
#endif /* UNIX */
+ #ifdef OS2
+ #define NO_UTMP
+ #endif /* OS2 */
+
#include "LYLeaks.h"
#ifdef SVR4_BSDSELECT
***************
*** 2011,2018 ****
return;
*AllocatedString = NULL; /* so StrAllocCopy doesn't free it */
StrAllocCopy(*AllocatedString,"file://localhost");
!
if (*old_string != '/') {
char *fragment = NULL;
#ifdef VMS
--- 2015,2029 ----
return;
*AllocatedString = NULL; /* so StrAllocCopy doesn't free it */
+ #ifdef OS2
+ StrAllocCopy(*AllocatedString,"file://localhost/"); /* Fully qualified path
+ names on OS/2 begin
+ with a drive letter,
+ not a slash (JFM) */
+ #else
StrAllocCopy(*AllocatedString,"file://localhost");
! #endif /* OS2 */
!
if (*old_string != '/') {
char *fragment = NULL;
#ifdef VMS
***************
*** 2876,2887 ****
--- 2887,2903 ----
if (!homedir) {
if ((homedir = getenv("HOME")) == NULL) {
+ #ifdef OS2
+ if ((homedir = getenv("TMP")) == NULL)
+ homedir = ".";
+ #endif /* OS2 */
#ifdef VMS
if ((homedir = getenv("SYS$LOGIN")) == NULL) {
if ((homedir = getenv("SYS$SCRATCH")) == NULL)
homedir = "sys$scratch:";
}
#else
+ #ifndef OS2
/* One could use getlogin() and getpwnam() here instead */
struct passwd *pw = getpwuid(geteuid());
if (pw && pw->pw_dir) {
***************
*** 2894,2899 ****
--- 2910,2916 ----
/* Use /tmp; it should be writable. */
homedir = "/tmp";
}
+ #endif /* !OS2 */
#endif /* VMS */
}
}
diff -cr -X exclude old/src/Makefile new/src/Makefile
*** old/src/Makefile Thu Jan 16 18:27:04 1997
--- new/src/Makefile Wed May 14 14:20:48 1997
***************
*** 11,21 ****
--- 11,29 ----
all: lynx
+ os2: lynx.exe
+
lynx: message $(OBJS) $(WWWLIB)
@echo "Linking and creating Lynx executable"
$(CC) $(CFLAGS) -o lynx $(OBJS) $(WWWLIB) $(SLANGLIB) $(LIBS)
@echo "Copying Lynx executable into this directory"
cp lynx ..
+ @echo "Welcome to Lynx!"
+ lynx.exe: message $(OBJS) $(WWWLIB)
+ @echo "Linking and creating Lynx executable"
+ $(CC) $(CFLAGS) -o lynx.exe $(OBJS) $(WWWLIB) $(SLANGLIB) $(LIBS)
+ @echo "Copying Lynx executable into this directory"
+ cp lynx.exe ..
@echo "Welcome to Lynx!"
message:
diff -cr -X exclude old/userdefs.h new/userdefs.h
*** old/userdefs.h Thu Apr 3 07:04:12 1997
--- new/userdefs.h Tue May 20 17:17:46 1997
***************
*** 216,222 ****
* mailcap files (see the examples in the samples directory).
*/
#ifndef LYNX_CFG_FILE
! #define LYNX_CFG_FILE "/usr/local/lib/lynx.cfg"
#endif /* LYNX_CFG_FILE */
/**************************
--- 216,222 ----
* mailcap files (see the examples in the samples directory).
*/
#ifndef LYNX_CFG_FILE
! #define LYNX_CFG_FILE "./lynx.cfg"
#endif /* LYNX_CFG_FILE */
/**************************
***************
*** 225,231 ****
* These global and personal files override anything in
* lynx.cfg or src/HTInit.c
*/
! #define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types"
#define PERSONAL_EXTENSION_MAP ".mime.types"
/**************************
--- 225,231 ----
* These global and personal files override anything in
* lynx.cfg or src/HTInit.c
*/
! #define GLOBAL_EXTENSION_MAP "/mptn/etc/mime.types"
#define PERSONAL_EXTENSION_MAP ".mime.types"
/**************************
***************
*** 234,240 ****
* These global and personal files override anything in
* lynx.cfg or src/HTInit.c
*/
! #define GLOBAL_MAILCAP "/usr/local/lib/mosaic/mailcap"
#define PERSONAL_MAILCAP ".mailcap"
/**************************
--- 234,240 ----
* These global and personal files override anything in
* lynx.cfg or src/HTInit.c
*/
! #define GLOBAL_MAILCAP "/mptn/etc/mailcap"
#define PERSONAL_MAILCAP ".mailcap"
/**************************
***************
*** 267,273 ****
* open is used as the default for NeXT, instead of the XLOADIMAGE_COMMAND
* definition.
*/
! #define XLOADIMAGE_COMMAND "xli %s &"
/**************************
* For UNIX systems this should be sendmail
--- 267,273 ----
* open is used as the default for NeXT, instead of the XLOADIMAGE_COMMAND
* definition.
*/
! #define XLOADIMAGE_COMMAND "cmd /c start ib %s"
/**************************
* For UNIX systems this should be sendmail
***************
*** 288,295 ****
--- 288,299 ----
#else
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__bsdi__)
#define SYSTEM_MAIL "/usr/sbin/sendmail"
+ #else
+ #ifdef OS2
+ #define SYSTEM_MAIL "sendmail.exe"
#else /* everthing else: */
#define SYSTEM_MAIL "/usr/lib/sendmail"
+ #endif /* OS2 */
#endif /* __FreeBSD || __NetBSD__ || __bsdi__ */
#endif /* MMDF */
***************
*** 299,305 ****
* This definition can be overridden at run time by setting a
* "LYNX_TEMP_SPACE" environment symbol.
*/
! #define TEMP_SPACE "/tmp/"
/********************************
* Don't let the user enter his/hers email address when sending a message.
--- 303,309 ----
* This definition can be overridden at run time by setting a
* "LYNX_TEMP_SPACE" environment symbol.
*/
! #define TEMP_SPACE (getenv("TMP"))
/********************************
* Don't let the user enter his/hers email address when sending a message.
***************
*** 370,377 ****
* http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
* This should be changed here or in lynx.cfg to the local path.
*/
! #define HELPFILE "http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html"
/* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
/*****************************
* DEFAULT_INDEX_FILE is the default file retrieved when the
--- 374,382 ----
* http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html
* This should be changed here or in lynx.cfg to the local path.
*/
! /* #define HELPFILE "http://www.crl.com/~subir/lynx/lynx_help/lynx_help_main.html" */
/* #define HELPFILE "file://localhost/PATH_TO/lynx_help/lynx_help_main.html" */
+ #define HELPFILE "file://localhost/./lynx_help/lynx_help_main.html"
/*****************************
* DEFAULT_INDEX_FILE is the default file retrieved when the
***************
*** 389,395 ****
* with the Up-Arrow or Down-Arrow keys after entering the 'g'oto
* command, whether or not a default is offered.
*/
! #define GOTOBUFFER FALSE
/*****************************
* JUMPFILE is the default local file checked for shortcut URLs when
--- 394,400 ----
* with the Up-Arrow or Down-Arrow keys after entering the 'g'oto
* command, whether or not a default is offered.
*/
! #define GOTOBUFFER TRUE
/*****************************
* JUMPFILE is the default local file checked for shortcut URLs when
***************
*** 460,466 ****
* if your system does not have utmp capabilities. CHANGE THIS here
* or in lynx.cfg.
*/
! #define LOCAL_DOMAIN "ukans.edu"
/********************************
* The DEFAULT_CACHE_SIZE specifies the number of WWW documents to be
--- 465,471 ----
* if your system does not have utmp capabilities. CHANGE THIS here
* or in lynx.cfg.
*/
! #define LOCAL_DOMAIN ""
/********************************
* The DEFAULT_CACHE_SIZE specifies the number of WWW documents to be
***************
*** 537,543 ****
* Taipei (Big5)
* 7 bit approximations
*/
! #define CHARACTER_SET "ISO Latin 1"
/*****************************
* PREFERRED_LANGUAGE is the language in MIME notation (e.g., "en",
--- 542,548 ----
* Taipei (Big5)
* 7 bit approximations
*/
! #define CHARACTER_SET "IBM PC codepage 850"
/*****************************
* PREFERRED_LANGUAGE is the language in MIME notation (e.g., "en",
***************
*** 751,767 ****
* curses supports line-drawing characters, set to '*' or any other character
* to not use line-drawing (e.g., '|' for vertical and '-' for horizontal).
*/
! #define BOXVERT '*'
! /* #define BOXVERT 0 */
! #define BOXHORI '*'
! /* #define BOXHORI 0 */
/******************************
* LY_UMLAUT controls the 7-bit expansion of characters with dieresis or
* umlaut. If defined, a digraph is displayed, e.g., auml --> ae
* Otherwise, a single character is displayed, e.g., auml --> a
*/
! #define LY_UMLAUT
/*******************************
* set to FALSE if you don't want users of your anonymous account
--- 756,772 ----
* curses supports line-drawing characters, set to '*' or any other character
* to not use line-drawing (e.g., '|' for vertical and '-' for horizontal).
*/
! /* #define BOXVERT '*' */
! #define BOXVERT 0
! /* #define BOXHORI '*' */
! #define BOXHORI 0
/******************************
* LY_UMLAUT controls the 7-bit expansion of characters with dieresis or
* umlaut. If defined, a digraph is displayed, e.g., auml --> ae
* Otherwise, a single character is displayed, e.g., auml --> a
*/
! /* #define LY_UMLAUT */
/*******************************
* set to FALSE if you don't want users of your anonymous account
***************
*** 930,936 ****
* also see src/HTInit.c to verify/change the execution
* script extensions and/or commands.
*/
! /* #define EXEC_LINKS */
/* #define EXEC_SCRIPTS */
/**********
--- 935,941 ----
* also see src/HTInit.c to verify/change the execution
* script extensions and/or commands.
*/
! #define EXEC_LINKS
/* #define EXEC_SCRIPTS */
/**********
***************
*** 1049,1055 ****
* instead (e.g., in a public account which will be used by people who
* are ignorant about VMS).
*/
! #define CHECKMAIL FALSE /* report unread and new mail messages */
/*********************************
* VI_KEYS can be turned on by the user in the options
--- 1054,1060 ----
* instead (e.g., in a public account which will be used by people who
* are ignorant about VMS).
*/
! #define CHECKMAIL TRUE /* report unread and new mail messages */
/*********************************
* VI_KEYS can be turned on by the user in the options
***************
*** 1137,1143 ****
* you prefer the more conservative action of requiring an explicit
* Y or y to confirm.
*/
! #define QUIT_DEFAULT_YES
/********************************
* These definitions specify files created or used in conjunction
--- 1142,1148 ----
* you prefer the more conservative action of requiring an explicit
* Y or y to confirm.
*/
! /* #define QUIT_DEFAULT_YES */
/********************************
* These definitions specify files created or used in conjunction
***************
*** 1208,1233 ****
** Other Unix:
** ===========
*/
! #define COMPRESS_PATH "/usr/ucb/compress"
! #define UNCOMPRESS_PATH "/usr/ucb/uncompress"
! #define UUDECODE_PATH "/bin/uudecode"
! #define ZCAT_PATH "/usr/local/bin/zcat"
! #define GZIP_PATH "/usr/local/bin/gzip"
! #define INSTALL_PATH "/bin/install"
! #define TAR_PATH "/bin/tar"
! #define TOUCH_PATH "/bin/touch"
#endif /* __FreeBSD__ || __NetBSD__ || __bsdi__ || LINUX */
/*
** All Unix:
** =========
*/
! #define ZIP_PATH "/usr/local/bin/zip"
! #define UNZIP_PATH "/usr/local/bin/unzip"
! #define MKDIR_PATH "/bin/mkdir"
! #define MV_PATH "/bin/mv"
! #define RM_PATH "/bin/rm"
! #define COPY_PATH "/bin/cp"
! #define CHMOD_PATH "/bin/chmod"
#endif /* VMS */
#endif /* USERDEFS_H */
--- 1213,1238 ----
** Other Unix:
** ===========
*/
! #define COMPRESS_PATH "gzip"
! #define UNCOMPRESS_PATH "gzip -d"
! #define UUDECODE_PATH "uudecode"
! #define ZCAT_PATH "gzip -dc"
! #define GZIP_PATH "gzip"
! #define INSTALL_PATH "install"
! #define TAR_PATH "tar"
! #define TOUCH_PATH "touch"
#endif /* __FreeBSD__ || __NetBSD__ || __bsdi__ || LINUX */
/*
** All Unix:
** =========
*/
! #define ZIP_PATH "zip.exe"
! #define UNZIP_PATH "unzip.exe"
! #define MKDIR_PATH "mkdir.exe"
! #define MV_PATH "mv.exe"
! #define RM_PATH "rm.exe"
! #define COPY_PATH "cp.exe"
! #define CHMOD_PATH "chmod.exe"
#endif /* VMS */
#endif /* USERDEFS_H */
diff -cr -X exclude old/WWW/Library/Implementation/HTAAProt.c new/WWW/Library/Implementation/HTAAProt.c
*** old/WWW/Library/Implementation/HTAAProt.c Thu Jul 11 16:31:46 1996
--- new/WWW/Library/Implementation/HTAAProt.c Tue May 13 19:49:14 1997
***************
*** 174,194 ****
--- 174,200 ----
if (current_prot && current_prot->gid_name) {
if (isNumber(current_prot->gid_name)) {
if (NULL != (gr = getgrgid(atoi(current_prot->gid_name)))) {
+ #ifndef OS2
+
if (TRACE) fprintf(stderr,
"%s(%s) returned (%s:%s:%d:...)\n",
"HTAA_getGid: getgrgid",
current_prot->gid_name,
gr->gr_name, gr->gr_passwd, gr->gr_gid);
+ #endif /* OS2 */
return gr->gr_gid;
}
+
}
else { /* Group name (not number) */
if (NULL != (gr = getgrnam(current_prot->gid_name))) {
+ #ifndef OS2
if (TRACE) fprintf(stderr,
"%s(\"%s\") returned (%s:%s:%d:...)\n",
"HTAA_getGid: getgrnam",
current_prot->gid_name,
gr->gr_name, gr->gr_passwd, gr->gr_gid);
+ #endif /* OS2 */
return gr->gr_gid;
}
}
diff -cr -X exclude old/WWW/Library/Implementation/HTAccess.c new/WWW/Library/Implementation/HTAccess.c
*** old/WWW/Library/Implementation/HTAccess.c Sat Feb 22 11:48:14 1997
--- new/WWW/Library/Implementation/HTAccess.c Mon May 19 17:14:14 1997
***************
*** 857,863 ****
HTLoadError(sink, 500, "Unable to access document.");
return NO;
}
!
/*
** If you get this, then please find which routine is returning
** a positive unrecognised error code!
--- 857,863 ----
HTLoadError(sink, 500, "Unable to access document.");
return NO;
}
!
/*
** If you get this, then please find which routine is returning
** a positive unrecognised error code!
diff -cr -X exclude old/WWW/Library/Implementation/HTFile.c new/WWW/Library/Implementation/HTFile.c
*** old/WWW/Library/Implementation/HTFile.c Fri Jan 10 15:55:30 1997
--- new/WWW/Library/Implementation/HTFile.c Mon May 19 15:55:16 1997
***************
*** 44,49 ****
--- 44,53 ----
#define HT_EM_SPACE ((char)2)
+ #ifdef OS2
+ #define lstat(x, y) fstat(x, y)
+ #endif /* OS2 */
+
#define FREE(x) if (x) {free(x); x = NULL;}
#ifdef VMS
***************
*** 215,226 ****
--- 219,232 ----
sprintf(buf, fmt, entry);
PUTS(buf);
END(HTML_A);
+ #ifndef OS2
if (c != 'A' && (st.st_mode & S_IFMT) == S_IFLNK &&
(len = readlink(file, buf, sizeof(buf))) >= 0) {
PUTS(" -> ");
buf[len] = '\0';
PUTS(buf);
}
+ #endif /* !OS2 */
*buf = '\0';
break;
***************
*** 264,272 ****
case S_IFIFO: type = 'p'; break;
case S_IFCHR: type = 'c'; break;
case S_IFDIR: type = 'd'; break;
- case S_IFBLK: type = 'b'; break;
case S_IFREG: type = '-'; break;
case S_IFLNK: type = 'l'; break;
#ifdef S_IFSOCK
case S_IFSOCK: type = 's'; break;
#endif /* S_IFSOCK */
--- 270,280 ----
case S_IFIFO: type = 'p'; break;
case S_IFCHR: type = 'c'; break;
case S_IFDIR: type = 'd'; break;
case S_IFREG: type = '-'; break;
+ #ifndef OS2
+ case S_IFBLK: type = 'b'; break;
case S_IFLNK: type = 'l'; break;
+ #endif /* !OS2 */
#ifdef S_IFSOCK
case S_IFSOCK: type = 's'; break;
#endif /* S_IFSOCK */
***************
*** 532,537 ****
--- 540,549 ----
FREE(access);
if ((0 == strcasecomp(host, HTHostName())) ||
(0 == strcasecomp(host, "localhost")) || !*host) {
+ #ifdef OS2
+ sscanf(path, "/%s", path); /* Get rid of leading slash
+ since we have a drive letter */
+ #endif /* OS2 */
FREE(host);
if (TRACE)
fprintf(stderr, "Node `%s' means path `%s'\n", name, path);
***************
*** 900,905 ****
--- 912,920 ----
#ifdef VMS
#define NO_GROUPS
#endif /* VMS */
+ #ifdef OS2
+ #define NO_GROUPS
+ #endif /* OS2 */
#ifdef NO_UNIX_IO
#define NO_GROUPS
#endif /* NO_UNIX_IO */
***************
*** 1162,1167 ****
--- 1177,1183 ----
outofmem(__FILE__, "HTDirTitles");
sprintf(relative, "%s/..", current);
#ifndef VMS
+
{
/*
** On Unix, if it's not ftp and the directory cannot
***************
*** 1171,1178 ****
** HTVMSBrowseDir().
*/
extern BOOLEAN LYisLocalFile PARAMS((char *logical));
DIR * dp = NULL;
!
if (LYisLocalFile(logical)) {
/*
** We need an absolute file path for the opendir.
--- 1187,1198 ----
** HTVMSBrowseDir().
*/
extern BOOLEAN LYisLocalFile PARAMS((char *logical));
+ #ifndef OS2
DIR * dp = NULL;
! #endif /* !OS2 */
! #ifdef OS2
! FILE * dp = NULL;
! #endif /* OS2 */
if (LYisLocalFile(logical)) {
/*
** We need an absolute file path for the opendir.
diff -cr -X exclude old/WWW/Library/Implementation/HTFile.h new/WWW/Library/Implementation/HTFile.h
*** old/WWW/Library/Implementation/HTFile.h Fri Jan 10 15:55:42 1997
--- new/WWW/Library/Implementation/HTFile.h Mon May 19 15:31:06 1997
***************
*** 14,19 ****
--- 14,25 ----
#include "HTAccess.h"
#include "HTML.h" /* SCW */
+ #ifdef OS2 /* Drive letter support for OS/2 (JFM) */
+ #define getcwd _getcwd2
+ #define chdir _chdir2
+ #endif /* OS2 */
+
+
/*
** Controlling globals
**
diff -cr -X exclude old/WWW/Library/Implementation/HTParse.c new/WWW/Library/Implementation/HTParse.c
*** old/WWW/Library/Implementation/HTParse.c Wed Feb 19 16:50:24 1997
--- new/WWW/Library/Implementation/HTParse.c Mon May 19 16:50:38 1997
***************
*** 371,377 ****
--- 371,379 ----
; /* last / */
p[1] = '\0'; /* Remove filename */
strcat(result, given.relative); /* Add given one */
+ #ifndef OS2 /* Never simplify pathname on OS2 */
HTSimplify (result);
+ #endif /* OS2 */
}
if (TRACE)
fprintf(stderr, "2\n");
diff -cr -X exclude old/WWW/Library/Implementation/HTTCP.c new/WWW/Library/Implementation/HTTCP.c
*** old/WWW/Library/Implementation/HTTCP.c Wed Feb 26 12:44:28 1997
--- new/WWW/Library/Implementation/HTTCP.c Tue May 13 19:44:34 1997
***************
*** 26,32 ****
#include <signal.h>
#include <sys/wait.h>
#endif /* NSL_FORK */
!
#define FREE(x) if (x) {free(x); x = NULL;}
extern int HTCheckForInterrupt NOPARAMS;
--- 26,36 ----
#include <signal.h>
#include <sys/wait.h>
#endif /* NSL_FORK */
!
! #ifdef OS2
! #include <sys/so_ioctl.h>
! #endif /* OS2 */
!
#define FREE(x) if (x) {free(x); x = NULL;}
extern int HTCheckForInterrupt NOPARAMS;
***************
*** 108,115 ****
--- 112,121 ----
#ifndef __NetBSD__
#ifndef __FreeBSD__
#ifndef BSDI
+ #ifndef OS2
extern char *sys_errlist[]; /* see man perror on cernvax */
extern int sys_nerr;
+ #endif /* !OS2 */
#endif /* BSDI */
#endif /* !__FreeBSD__ */
#endif /* !__NetBSD__ */
diff -cr -X exclude old/WWW/Library/Implementation/HTTelnet.c new/WWW/Library/Implementation/HTTelnet.c
*** old/WWW/Library/Implementation/HTTelnet.c Wed Jun 26 11:17:00 1996
--- new/WWW/Library/Implementation/HTTelnet.c Sat Jul 12 09:44:28 1997
***************
*** 216,221 ****
--- 216,248 ----
#define TELNET_DONE
#endif /* MULTINET */
+ #ifdef OS2
+ #ifndef TELNET_DONE
+ if (login_protocol == rlogin) {
+ sprintf(command, "%s %s%s%s", RLOGIN_COMMAND,
+ hostname,
+ user ? " -l " : "",
+ user ? user : "");
+
+ } else if (login_protocol == tn3270) {
+ sprintf(command, "%s %s %s", TN3270_COMMAND,
+ hostname,
+ port ? port : "");
+
+ } else { /* TELNET */
+ sprintf(command, "%s %s %s", TELNET_COMMAND,
+ hostname,
+ port ? port : "");
+ }
+
+ if (TRACE)
+ fprintf(stderr, "HTTelnet: Normal: Command is: %s\n\n", command);
+ system(command);
+ return HT_NO_DATA; /* Ok - it was done but no data */
+ #define TELNET_DONE
+ #endif /* !TELNET_DONE */
+ #endif /* OS2 */
+
#if defined(WIN_TCP)
{
char *cp;
diff -cr -X exclude old/WWW/Library/Implementation/HTUtils.h new/WWW/Library/Implementation/HTUtils.h
*** old/WWW/Library/Implementation/HTUtils.h Thu Dec 19 13:00:52 1996
--- new/WWW/Library/Implementation/HTUtils.h Mon May 19 16:04:32 1997
***************
*** 106,111 ****
--- 106,117 ----
#endif /* !VMS */
+ #ifdef OS2 /* Drive letter support for OS/2 (JFM) */
+ #define getcwd _getcwd2
+ #define chdir _chdir2
+ #endif /* OS2 */
+
+
/*
Macros for declarations