InfoMagic Internet Tools 1995 April

home *** CD-ROM | disk | FTP | other *** search

/ InfoMagic Internet Tools 1995 April / Internet Tools.iso / infoserv / gopher / Unix / gopher2.0-patches / patch15.Z / patch15

Wrap

Text File | 1994-05-26 | 266.2 KB | 9,891 lines

diff -c gopher+/Makefile.config.dist:3.12 gopher+/Makefile.config.dist:3.13 *** gopher+/Makefile.config.dist:3.12 Fri May 27 00:08:36 1994 --- gopher+/Makefile.config.dist Fri May 27 00:08:36 1994 *************** *** 5,12 **** #******************************************************************** # $Author: lindner $ ! # $Revision: 3.12 $ ! # $Date: 1994/03/08 15:54:06 $ # $Source: /export/arcwelder/GopherSrc/CVS/gopher+/Makefile.config.dist,v $ # $State: Exp $ # --- 5,12 ---- #******************************************************************** # $Author: lindner $ ! # $Revision: 3.13 $ ! # $Date: 1994/05/27 04:56:29 $ # $Source: /export/arcwelder/GopherSrc/CVS/gopher+/Makefile.config.dist,v $ # $State: Exp $ # *************** *** 20,25 **** --- 20,28 ---- #********************************************************************* # Revision History: # $Log: Makefile.config.dist,v $ + # Revision 3.13 1994/05/27 04:56:29 lindner + # Use -O + # # Revision 3.12 1994/03/08 15:54:06 lindner # Add item for VFORK # *************** *** 101,108 **** # Optimization level. # ! OPT=-g ! #OPT=-O #------------------------------------------------ # System Selection, note that you won't have to edit --- 104,111 ---- # Optimization level. # ! #OPT=-g ! OPT=-O #------------------------------------------------ # System Selection, note that you won't have to edit diff -c gopher+/conf.h:3.16 gopher+/conf.h:3.17 *** gopher+/conf.h:3.16 Fri May 27 00:08:37 1994 --- gopher+/conf.h Fri May 27 00:08:37 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/04/14 17:03:02 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/conf.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.17 $ ! * $Date: 1994/05/11 02:48:16 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/conf.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: conf.h,v $ + * Revision 3.17 1994/05/11 02:48:16 lindner + * fix for VMS gopherprint defines + * * Revision 3.16 1994/04/14 17:03:02 lindner * fix for html command * *************** *** 209,216 **** * default queue name or form type eg DEFINE/JOB GOPHERQUEUE "/queue=que1") * and then define the Printer Command appropriately */ ! #define PRINTER_COMMAND "print" /* */ ! /* #define PRINTER_COMMAND "@GopherP_Dir:GOPHERPRINT" /* */ /* * Sounds are not implemented on VMS. --- 212,219 ---- * default queue name or form type eg DEFINE/JOB GOPHERQUEUE "/queue=que1") * and then define the Printer Command appropriately */ ! #define PRINTER_COMMAND "print %s" /* */ ! /* #define PRINTER_COMMAND "@GopherP_Dir:GOPHERPRINT %s" /* */ /* * Sounds are not implemented on VMS. diff -c gopher+/patchlevel.h:3.16 gopher+/patchlevel.h:3.17 *** gopher+/patchlevel.h:3.16 Fri May 27 00:08:37 1994 --- gopher+/patchlevel.h Fri May 27 00:08:37 1994 *************** *** 5,8 **** #define GOPHER_MAJOR_VERSION "2" #define GOPHER_MINOR_VERSION "0" ! #define PATCHLEVEL 14 --- 5,8 ---- #define GOPHER_MAJOR_VERSION "2" #define GOPHER_MINOR_VERSION "0" ! #define PATCHLEVEL 15 diff -c gopher+/doc/client.changes:3.20 gopher+/doc/client.changes:3.21 *** gopher+/doc/client.changes:3.20 Fri May 27 00:08:38 1994 --- gopher+/doc/client.changes Fri May 27 00:08:38 1994 *************** *** 1,6 **** ! $Id: client.changes,v 3.20 1994/04/22 07:44:04 lindner Exp $ ! Gopher+2.0 patchlevel 13 ------------------------ * Fix for the problem of vanishing bookmarks --- 1,65 ---- ! $Id: client.changes,v 3.21 1994/05/27 02:18:44 lindner Exp $ ! Gopher+2.0 patchlevel 15 ! ------------------------ ! ! * Many modifications for internationalization. Gopher can now use ! message catalogs for French and Spanish. Adding other languages is ! fairly easy. ! ! * Fix for Forms with multiple AskL items, or AskL items not as the ! last item. ! ! * Don't allow users with rsh to specify a shell as an display or ! print application. ! ! * Added documentation on the new URL= option in .link file from Alan ! Coopersmith ! ! * New manual page for gopherrc. ! ! * Fix for bad free() in CURrequest() ! ! * Fixed ^_ mislabel of the ^- help command. ! ! * Added prompt for RETURN in VMSExit(), to enable reading of ACCVIO ! tracebacks ! ! * Changed return values of DCLSystem() to be compatible with the ! for-Unix code. ! ! * Fixed spawns to work with OpenVMS/AXP v6.1 (still doesn't have the ! TRUSTED flag). ! ! * Modifications for Debug() and mismatched NULL arguments, added ! Debugmsg ! ! * Fix for last line without newline ! ! * Mods for TCPWARE on VMS ! ! * Use fast malloc routines on VMS VAXC. ! ! * Fix for binhex downloads on vms and use dump command for binary files ! ! * Fix for bad free() in SetOptions() ! ! * Added code for mapping telnet and/or tn3270 commands to "- none -" for ! disabling them and having the client issue "Sorry, not implemented" ! messages on efforts to use Type 8 or T tuples. ! ! * Added FIOsystem() failure messages for both VMS and Unix. (all from ! F.Macrides) ! ! * Allow VMS environment variable reading routines to be used on Unix ! systems. ! ! * eliminate redefinition of open to open_vmsopt() for ALPHA (Macrides) ! ! * Fixed break of open() for Alpha. (all From F.Macrides) ! ! ! Gopher+2.0 patchlevel 14 ------------------------ * Fix for the problem of vanishing bookmarks diff -c gopher+/doc/gopher.1:3.2 gopher+/doc/gopher.1:3.4 *** gopher+/doc/gopher.1:3.2 Fri May 27 00:08:38 1994 --- gopher+/doc/gopher.1 Fri May 27 00:08:39 1994 *************** *** 4,21 **** .SH SYNOPSIS .B gopher .RI [ -sSbDr ] ! .RI [ -t ! .IR title] ! .RI [ -p ! .IR path] ! .RI [ -T ! .IR type] ! .RI [ -i ! .IR search term] ! .RI [ hostname ! .IR port ] .SH DESCRIPTION ! The gopher client is used to talk to gopher servers. .PP The Internet Gopher is a distributed document delivery service. It allows a neophyte user to access various types of data residing on --- 4,20 ---- .SH SYNOPSIS .B gopher .RI [ -sSbDr ] ! .RI [ "-t title" ] ! .RI [ "-p path" ] ! .RI [ "-T type" ] ! .RI [ "-i search term" ] ! .RI [ hostname ] ! .RI [ port ] .SH DESCRIPTION ! The gopher client is used to talk to gopher servers. Once you have started ! the gopher client, help on using it is available by pressing the ! .B "?" ! key. .PP The Internet Gopher is a distributed document delivery service. It allows a neophyte user to access various types of data residing on *************** *** 25,89 **** Server accepts simple queries, and responds by sending the client a document. .PP ! -b starts the client on the bookmark page. ! .PP The next few options are for more advanced users who want to start at a location other than the default, or to set up special aliases or shell-scripts to point the gopher client to seperate places. .PP ! Use the -p option to specify a specific selector string to send to the ! root level server on startup. ! ! .PP ! Use the -T option to let the client know what type of object the -p option ! is pointing at. ! ! .PP ! Use the -i option to tell the client what to search for in the object ! defined by the -p and -T 7 options ! ! .PP ! Use the -t option to set the title of the initial screen for the gopher ! client. ! ! .PP ! The last few options aren't really of interest to regulat users, but are provided for system administrators who waht to provide a secure client, or who need to debug a client. ! .PP ! -s and -S means "secure mode" which means that you can't save or print the ! files that you browse. -s is for users without an account, while -S assumes ! the user has an account on this machine. ! .PP ! -r tells the client that its user is remote. ! .PP ! -D turns on the copius debugging output ! .SH ENVIRONMENT VARIABLES ! .PP ! The client checks for environment variables for its configuration ! information. The following variables can be used: ! .RS 3 ! GOPHER_MAIL: ! The program to send mail with (must understand -s option) ! GOPHER_TELNET: ! The program to contact telnet services with. ! GOPHER_PLAY: ! The program to play sound from a pipe. ! GOPHER_PRINTER: ! The program to print from a pipe. ! .RE .SH FILES - ~/.gopherrc bookmarks, and configuration information... --- 24,166 ---- Server accepts simple queries, and responds by sending the client a document. .PP ! .SH OPTIONS ! .TP ! -b ! starts the client on the bookmark page. .PP The next few options are for more advanced users who want to start at a location other than the default, or to set up special aliases or shell-scripts to point the gopher client to seperate places. + .TP + .BI -p " path" + specify a specific selector string to send to the gopher server on startup. + .TP + .BI -T " type" + let the client know what type of object the + .I -p + option is pointing at. + .TP + .BI -i " search term" + tell the client what to search for in the object defined by the + .IR "-p " and " -T 7" + options. + .TP + .BI -t " title" + set the title of the initial screen for the gopher client. .PP ! The last few options aren't really of interest to regular users, but are provided for system administrators who waht to provide a secure client, or who need to debug a client. ! .TP ! .BR -s " or " -S ! "secure mode" which means that you can't save or print the files that you ! browse. -s is for users without an account, while -S assumes ! the user has an account on this machine. One security feature is ! forced on, regardless of the state of these options, if the name of ! the user's shell ends in rsh; the 'O' (options) command is disabled so ! the user cannot select a shell as an application. ! .TP ! .B -r ! tells the client that its user is remote. ! .TP ! .B -D ! turns on the copius debugging output ! .SH EXAMPLES ! .TP ! gopher gopher.tc.umn.edu ! Connect to the gopher server running on the computer ! .I gopher.tc.umn.edu ! .TP ! gopher -p "1/Information About Gopher" gopher.tc.umn.edu 70 ! Connect to the gopher server running on port 70 of the computer ! .I gopher.tc.umn.edu ! and start at the menu retrieved with the selector string ! .I "1/Information About Gopher" ! .TP ! gopher -p 7/indexes/Gopher-index/index -T 7 -i FAQ mudhoney.micro.umn.edu ! Connect to the gopher server running on the computer ! .I mudhoney.micro.umn.edu ! and start at the menu of items matching the string ! .I FAQ ! in the index specified by the selector string ! .I "7/indexes/Gopher-index/index" ! .SH CONFIGURATION FILE FORMAT ! The client gets configuration data from the system gopher.rc file and the ! user's .gopherrc files. The options in these files may be set by using the ! .B O ! key in the client. ! The entries in this file are: ! .TP ! .BI map: " file type,viewer,printer" ! This tells the client how to deal with various types of files. ! .I file type ! is the Gopher+ or Internet Media Type (formerly called MIME Content Type) ! to process with this line. The ! .I viewer ! is the program to display the file to the user. The ! .I printer ! is used to send a file to the printer. ! If the viewer or printer begins with a ! .B "|" ! the file is piped into the program's standard input. The string ! .B "%s" ! is replaced with the name of a temporary file containing the document to ! be printed or viewed. ! .TP ! .BI Searchbolding: (yes|no) ! Sets whether or not the built-in pager highlights the words it finds when ! searching. + .TP + .BI Bookmarks: + A list of bookmarks the user has added with the clients 'a' and 'A' + commands. Viewed by starting the client with the '-b' option or using + the 'v' command inside the client. + + .SH ENVIRONMENT VARIABLES + The client also checks for environment variables for its configuration + information. The following variables can be used: + .TP + GOPHER_TELNET: + The program used to connect to telnet services + .TP + GOPHER_TN3270: + The program used to connect to TN3270 services + .TP + GOPHER_HTML: + The program used to read HyperText Markup Language documents. + .TP + GOPHER_PRINTER: + The program used to print from a pipe. + .SH FILES + .TP + $HOME/.gopherrc + user bookmarks and configuration information + .TP + /usr/local/lib/gopher.rc + system default configuration information (default location - may be + somewhere else on your system) + .TP + /usr/local/lib/gopher.hlp + client help file displayed by the '?' command (default location - may be + somewhere else on your system) + + .SH COPYRIGHT + .PP + The Internet Gopher(tm) software and documentation is copyright (c) 1991, + 1992, 1993, 1994 by the University of Minnesota. Gopher has limitations on + its use and comes without a warranty. Please refer to the file 'Copyright' + included in the distribution. diff -c gopher+/doc/gopherd.8:3.4 gopher+/doc/gopherd.8:3.5 *** gopher+/doc/gopherd.8:3.4 Fri May 27 00:08:39 1994 --- gopher+/doc/gopherd.8 Fri May 27 00:08:39 1994 *************** *** 1,4 **** ! .Id $Id: gopherd.8,v 3.4 1993/09/22 04:33:08 lindner Exp $ .TH GOPHERD/GOPHERLS/GINDEXD 8 Local .SH NAME gopherd, gopherls, gindexd - serve data using the gopher protocol. --- 1,4 ---- ! .Id $Id: gopherd.8,v 3.5 1994/05/17 17:33:46 lindner Exp $ .TH GOPHERD/GOPHERLS/GINDEXD 8 Local .SH NAME gopherd, gopherls, gindexd - serve data using the gopher protocol. *************** *** 364,376 **** This kind of trick may be necessary in some cases, when gopherd.conf's "ignore:" tags don't, or can't cover something specific, and thus for ! object "fred", the overriding .cap/fred -file should be: .RS 3 ! Type=- .RE ! by overriding default type to be "-". This kind of hideouts may be usefull, when for some reason there are symlinks (or whatever) in the directory at which the Gopherd looks at, and those entries are not desired to be shown at all. --- 364,377 ---- This kind of trick may be necessary in some cases, when gopherd.conf's "ignore:" tags don't, or can't cover something specific, and thus for ! object "fred", the overriding .names file entry would be: .RS 3 ! Type=X ! Path=./fred .RE ! by overriding default type to be "X". This kind of hideouts may be usefull, when for some reason there are symlinks (or whatever) in the directory at which the Gopherd looks at, and those entries are not desired to be shown at all. *************** *** 531,545 **** .SH WWW and HTML support. ! Gopherd can be queried by WWW clients in the hypertext mode. The ! server caches the HTML pages it makes. You can include HTML stuff ! that will appear above the directory by making a file ! called \*(lq.about.html\*(rq The gopher server will send this before the ! menu. References to Gopherd-WWW pages are as follows: ! http://hostname.domainname:port/gopherpath/ .SH EXAMPLES --- 532,545 ---- .SH WWW and HTML support. ! Gopherd can be queried by WWW clients in the hypertext mode. The server ! does not currently cache the HTML pages it makes. You can include HTML stuff ! that will appear above the directory by making a file called ! \*(lq.about.html\*(rq The gopher server will send this before the menu. References to Gopherd-WWW pages are as follows: ! .RI "gopher://" "hostname.domainname" ":" "port" "/hh/" "gopherpath" .SH EXAMPLES *************** *** 746,750 **** .LP .SH "SEE ALSO" ! .BR gopher (1), ! .BR gopherd.conf (5) --- 746,751 ---- .LP .SH "SEE ALSO" ! .BR gopher (1); ! .BR gopherd.conf (5); ! .IR "The Internet Gopher Protocol" ", March 1993, RFC 1436" diff -c gopher+/doc/gopherd.conf.5:3.6 gopher+/doc/gopherd.conf.5:3.7 *** gopher+/doc/gopherd.conf.5:3.6 Fri May 27 00:08:39 1994 --- gopher+/doc/gopherd.conf.5 Fri May 27 00:08:39 1994 *************** *** 16,45 **** token. A pound sign ("#") at the beginning of a line signifies a comment line. .I ! Quick pseudo grammer .IP ! Admin:\ <Administrator\ Name/Info> ! AdminEmail:\ <Email\ address\ of\ Administrator\ of\ the\ server> ! Hostalias:\ <DNS\ alias\ name> ! Site:\ <Name\ of\ site> ! Org:\ <Organization\ or\ group\ owning\ the\ site> ! Loc:\ <city,\ state,\ country> ! Logfile:\ <filename> ! Geog:\ <latitude>\ <longitude> ! Language:\ <default\ language> ! ViewExt:\ <extension>\ <Gophertype>\ <Prefix>\ <Gopher+Type>\ [Langauge] ! BlockExt:\ <extension>\ <Blockname> ! BlockRefExt: ! Ignore:\ <extension> Decoder: <extension> <decoderprogram> SecureUsers: <tix-filename> ! Access:\ <domain\ name|ip\ fragment|"default">\ <[!](browse|read|search)+> <maxsessions> ! Bummermsg:\ <message> ! VeronicaIndex:\ <yes/no> ! Cachetime:\ <time in seconds> auxconf: <gopher-selector> <auxilliary-config-file> ! pid_directory: <directory to store pid files> .LP The following tokens are recognized --- 16,48 ---- token. A pound sign ("#") at the beginning of a line signifies a comment line. .I ! Quick pseudo grammar .IP ! .nf ! Admin: <Administrator Name/Info> ! AdminEmail: <Email address of Administrator of the server> ! Hostalias: <DNS alias name> ! Site: <Name of site> ! Org: <Organization or group owning the site> ! Loc: <city, state, country> ! Logfile: <filename> ! Geog: <latitude> <longitude> ! Language: <default language> ! ViewExt: <extension> <Gophertype> <Prefix> <Gopher+Type> [Langauge] ! BlockExt: <extension> <Blockname> ! BlockRefExt: <extension> <Blockname> ! Ignore: <extension> ! Ignore_patt: <regular expression> Decoder: <extension> <decoderprogram> SecureUsers: <tix-filename> ! Access: <domain name|ip fragment|"default"> <[!](browse|read|search)+> <maxsessions> ! Bummermsg: <message> ! VeronicaIndex: <yes/no> ! Cachetime: <time in seconds> auxconf: <gopher-selector> <auxilliary-config-file> ! Pids_directory: <directory to store pid files> ! .fi .LP The following tokens are recognized *************** *** 107,114 **** .B .gif. The next parameter is the single character gopher type (1,0,I,etc...) The third parameter is a prefix that will be appended to the normal ! filename path. The fourth parameter is the gopher+ view attribute, such ! as .B image/gif The optional fifth parameter is a language to use for the file instead of the default language. --- 110,117 ---- .B .gif. The next parameter is the single character gopher type (1,0,I,etc...) The third parameter is a prefix that will be appended to the normal ! filename path. The fourth parameter is the gopher+ view attribute or ! Internet Media Type (formerly called MIME Content Types), such as .B image/gif The optional fifth parameter is a language to use for the file instead of the default language. *************** *** 118,123 **** --- 121,131 ---- the ignore criteria are never presented to the gopher user. However, ignoring files does not protect them from prying eyes. .TP + .I Ignore_patt: + specifies a regular expression for filenames to not include in directory + listings presented to clients. Ignoring files does not protect them + from prying eyes. + .TP .I BlockExt: specifies that a file with a particular extension is to be mapped to a specific gopher+ attribute block. For instance the line: *************** *** 125,131 **** would map all files with the extension .abstract into an abstract for the file without the abstract extension. .TP ! .I BlockExtRef Alias of .IR BlockExt . .TP .I Decoder: --- 133,140 ---- would map all files with the extension .abstract into an abstract for the file without the abstract extension. .TP ! .I BlockExtRef: ! Alias of .IR BlockExt . .TP .I Decoder: *************** *** 132,144 **** specifies that the given program will be run on the given extension when the file is retrieved. This is most often used for compressed files. .TP ! .I SecureUsers specifies account file for AUTH1 access protocol. .TP ! .I VeronicaIndex ! defines a crude control of wether or not .I Veronica ! servers should index this tree or not. Valid values: "no" to forbid, anything else to allow. .TP .I BummerMsg: --- 141,157 ---- specifies that the given program will be run on the given extension when the file is retrieved. This is most often used for compressed files. .TP ! .I Pids_Directory: ! a scratch directory for concurrent session load limiting. Needs to be ! inside your gopher-data directory if running chrooted. ! .TP ! .I SecureUsers: specifies account file for AUTH1 access protocol. .TP ! .I VeronicaIndex: ! defines a crude control of whether or not .I Veronica ! servers should index this tree. Valid values: "no" to forbid, anything else to allow. .TP .I BummerMsg: *************** *** 174,179 **** --- 187,195 ---- # hostalias: gopher.turnip.com + # How long a .cache or .cache+ file is valid (in seconds) + Cachetime: 180 + # Administrator Admin: Bob Bagel, Turnip Postmaster and Gopher support 1-800-555-1212 *************** *** 193,198 **** --- 209,218 ---- # Extension mapping # + # Files the server needs to decode before sending + decoder: .Z /usr/ucb/zcat + decoder: .gz /usr/gnu/bin/zcat + # Different Languages viewext: .txt.spanish 0 0 Text/plain Es_ES viewext: .txt.german 0 0 Text/plain De_DE *************** *** 201,275 **** viewext: .hqx 4 0 application/mac-binhex40 # - # Telnet file formats - # - viewext: .telnet 8 0 terminal/telnet - viewext: .tn3270 T 0 terminal/tn3270 - - # # Graphics file formats # viewext: .gif I 9 image/gif - viewext: .pcx I 9 image/pcx - viewext: .pict I 9 image/PICT viewext: .tiff I 9 image/TIFF viewext: .jpg I 9 image/JPEG - viewext: .ppm I 9 image/ppm - viewext: .pgm I 9 image/pgm - viewext: .pbm I 9 image/pgm # # Sounds # ! viewext: .au s s audio/mulaw ! viewext: .snd s s audio/mulaw ! viewext: .wav s s audio/wave # # Movies # ! viewext: .quicktime 9 9 video/quicktime ! viewext: .mpg 9 9 video/mpeg # # Binary files # ! viewext: .tar.Z 9 9 file/tar.Z ! viewext: .tar 9 9 file/tar ! viewext: .zip 5 9 file/PKzip ! viewext: .zoo 5 9 file/Zoo ! viewext: .arc 5 9 file/Arc ! viewext: .lzh 5 9 file/Lharc ! viewext: .exe 5 9 file/PCEXE ! viewext: .mcb 9 9 file/MacBinary ! viewext: .uu 9 9 file/uuencode # # Various forms of text # ! viewext: .ps 0 0 Text/postscript ! viewext: .tex 0 0 Text/tex ! viewext: .dvi 0 9 Text/dvi ! viewext: .troff 0 0 Text/troff ! viewext: .unicode 0 0 Text/unicode ! viewext: .sjis 0 0 Text/sjis ! viewext: .jis 0 0 Text/jis ! viewext: .euc 0 0 Text/jis ! viewext: .big5 0 0 Text/big-5 ! viewext: .rtf 0 0 Text/rtf ! viewext: .word5 0 0 Text/MSWord5 ! viewext: .word4 0 0 Text/MSWord4 ! viewext: .mw 0 0 Text/MacWrite ! viewext: .wp 0 0 Text/WordPerfect51 viewext: .smell 9 9 smell/funky # # ! viewext: .mindex 7 mindex: Directory viewext: .src 7 waissrc: Directory ! viewext: .html h GET /h application/WWW # # Map files to certain blocks --- 221,278 ---- viewext: .hqx 4 0 application/mac-binhex40 # # Graphics file formats # viewext: .gif I 9 image/gif viewext: .tiff I 9 image/TIFF viewext: .jpg I 9 image/JPEG # # Sounds # ! viewext: .au s s audio/basic ! viewext: .snd s s audio/basic ! viewext: .wav s s audio/microsoft-wave # # Movies # ! viewext: .mov ; 9 video/quicktime ! viewext: .mpg ; 9 video/mpeg # # Binary files # ! viewext: .zip 5 9 application/zip ! viewext: .arj 5 9 application/x-arj # # Various forms of text # ! viewext: .ps 0 0 application/postscript ! viewext: .tex 0 0 application/x-tex ! viewext: .dvi 0 9 application/x-dvi ! viewext: .troff 0 0 Text/x-troff + # + # These are defined by IANA.. + # + viewext: .rtf 0 0 application/rtf + viewext: .word 0 0 application/MSWord + viewext: .mw 0 0 application/MacWriteII + viewext: .wp 0 0 application/dca-rft + viewext: .rch 0 0 Text/richtext + viewext: .wri 9 9 application/Microsoft-write + + viewext: .smell 9 9 smell/funky # # ! viewext: .mindex 7 mindex: application/gopher-menu viewext: .src 7 waissrc: Directory ! viewext: .html h 0 text/html # # Map files to certain blocks *************** *** 284,289 **** --- 287,297 ---- # Bummermsg: Sorry no access for non turnipheads. + # scratch directory for concurrent session load limiting. + # Needs to be inside your gopher-data directory if running chrooted. + # + PIDS_Directory: /pids + # Don't allow anyone to read or browse, nor ftp via us, # anyone can search though. access: default !browse,!read,!ftp,search *************** *** 309,311 **** --- 317,322 ---- access: bozo.org !search . + + .SH "SEE ALSO" + .IR "Media Type Registration Procedure" ", March 1994, RFC 1590" diff -c /dev/null gopher+/doc/gopherrc.5:3.2 *** /dev/null Fri May 27 00:08:40 1994 --- gopher+/doc/gopherrc.5 Fri May 27 00:08:40 1994 *************** *** 0 **** --- 1,105 ---- + .TH GOPHERRC 5 + .SH NAME + gopherrc \- configuration file for gopher(1) + .SH DESCRIPTION + .LP + The + .B gopherrc + file contains a list of directives that alter the behaviour of the + .BR gopher(1) + client. It is composed of lines of the form: + .IP + .I + Token:\ Value + .LP + Tokens are case insensitive and the value field will change, depending on the + token. A pound sign ("#") at the beginning of a line signifies a + comment line. + + Gopherrc files are used in a number of places. There is a global + gopherrc file (called gopherrc). This is usually placed in a + systemwide directory. A file with the same format called + remotegopher.rc is also used by the gopher client when using the -r + switch. + + Also, an individual has their own customized version of this file in + their home directory in the file .gopherrc. On VMS this file is called + GOPHERRC. + + All of these files use the format described below. + + Most people will set the values in this file by pressing the 'O' key + to set options in the curses gopher client, rather than editing this + file directly. People considering editing this file on VMS should + make sure their editor preserves the Stream_LF format of the file. + + .I + Quick pseudo grammar + + .IP + .nf + map: <content type>,<display command>,<print command> + SearchBolding: <yes|no> + Bookmarks: + <bookmarks> + + .fi + .LP + + The following tokens are recognized + .TP 12 + .I map: + .LP + maps a content type (such as text/plain, or image/gif) to commands to + execute for displaying the document or printing the document, i.e. + 'more -d %s' or 'lpr %s'. + + The content type, display command, and printing command are separated + by commas. + + The sequence of %s is replaced with the filename of the item that's + downloaded. + + If the command starts with the vertical bar (|) the command will be + executed immediately and the document will be sent to the commands + standard input. Note this feature does not work on VMS. + + If the display command is set to 'builtin', then the text file pager + inside the gopher client will be used to display the item. + + .TP 12 + .I SearchBolding: + .LP + + controls the clients display of search terms. If the value is 'yes', + then search words will be bolded. Otherwise they'll be left alone. + + .TP 12 + .I Bookmarks: + .LP + The bookmarks in .link format follow. For more information on the + format of a .link file, consult the gopherd(8) manual page. + + + .I + Sample gopherrc file: + + map: text/plain,builtin,lpr %s + map: image/gif,xv %s, + Bookmarks: + Type=1 + Name=Bookmark #1 + Host=gopher.tc.umn.edu + Port=70 + Path= + # + Type=0+ + Name=textfile + Host=foo.com + Path=0/readme + Port=70 + . + + .SH "SEE ALSO" + .IR "Media Type Registration Procedure" ", March 1994, RFC 1590" + .IR gopher(1), gopherd(8) diff -c gopher+/doc/server.changes:3.21 gopher+/doc/server.changes:3.22 *** gopher+/doc/server.changes:3.21 Fri May 27 00:08:40 1994 --- gopher+/doc/server.changes Fri May 27 00:08:40 1994 *************** *** 1,4 **** ! $Id: server.changes,v 3.21 1994/04/22 07:44:05 lindner Exp $ Gopher+2.0 patchlevel 14 ------------------------ --- 1,31 ---- ! $Id: server.changes,v 3.22 1994/05/27 02:18:46 lindner Exp $ ! ! Gopher+2.0 patchlevel 15 ! ------------------------ ! ! * Add NO_FREEWAIS option for older WAIS libraries to Makefile.config ! ! * Fix for spinning ftp processes from R.S. Jones, plus many other ! fixes for the ftp gateway from Jonzy. ! ! * Add port# to waiting for connection message that 'ps' generates. ! ! * Fix for sending text files with really long lines. ! ! * Default gopherd.conf has been reorganized, Added soundtracker type ! ! * Fix for mindex file processing.. ! ! * Modifications for Debug() and mismatched NULL arguments, added Debugmsg ! ! * Fix from Robert Beckett for binhex files ! ! * Fix for url problems ! ! * Fix for svr4.2 on unisys ! ! * Automagically define NO_VFORK for SCO ! Gopher+2.0 patchlevel 14 ------------------------ diff -c gopher+/gopher/CURcurses.c:3.42 gopher+/gopher/CURcurses.c:3.46 *** gopher+/gopher/CURcurses.c:3.42 Fri May 27 00:08:42 1994 --- gopher+/gopher/CURcurses.c Fri May 27 00:08:42 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.42 $ ! * $Date: 1994/04/13 19:13:20 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/CURcurses.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.46 $ ! * $Date: 1994/05/24 05:49:54 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/CURcurses.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,40 ---- ********************************************************************* * Revision History: * $Log: CURcurses.c,v $ + * Revision 3.46 1994/05/24 05:49:54 lindner + * Fix for bad free() in CURrequest() + * + * Revision 3.45 1994/04/25 20:43:29 lindner + * Remove ugly pointer debug statement + * + * Revision 3.44 1994/04/25 03:49:41 lindner + * Fixed ^_ mislabel of the ^- help command. + * + * Added prompt for RETURN in VMSExit(), to enable reading of ACCVIO tracebacks. + * + * Changed return values of DCLSystem() to be compatible with the + * for-Unix code. + * + * Fixed spawns to work with OpenVMS/AXP v6.1 (still doesn't have the + * TRUSTED flag). + * + * Revision 3.43 1994/04/25 03:37:35 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.42 1994/04/13 19:13:20 lindner * AskL modifications * *************** *** 685,691 **** default: if (ch < 256 && isprint(ch) && curpointer == maxlength) { - Debug("CURwgetstr Beep %d\r\n",cur); CURBeep(cur); } else if (ch < 256 && isprint(ch)) { --- 705,710 ---- *************** *** 945,951 **** } #endif else { ! Debug("CURgetYesorNo beep\r\n",NULL) CURBeep(cur); } } --- 964,970 ---- } #endif else { ! Debugmsg("CURgetYesorNo beep\r\n") CURBeep(cur); } } *************** *** 955,961 **** CURBeep(cur) CursesObj *cur; { ! Debug("CURBeep\r\n",NULL) #ifdef SYSVCURSES beep(); #else --- 974,980 ---- CURBeep(cur) CursesObj *cur; { ! Debugmsg("CURBeep\r\n") #ifdef SYSVCURSES beep(); #else *************** *** 1118,1124 **** /** Free memory **/ for (i=0; i <= numprompts; i++) ! free(items[i]); free(items); return(choice); --- 1137,1144 ---- /** Free memory **/ for (i=0; i <= numprompts; i++) ! if (items[i]) ! free(items[i]); free(items); return(choice); *************** *** 1135,1141 **** "^P : Move to previous field", "^F : Display next page", "^B : Display previous page", ! "^_ : Help (^/ or ^7 may work)", "Enter : Accept", NULL }; --- 1155,1161 ---- "^P : Move to previous field", "^F : Display next page", "^B : Display previous page", ! "^- : Help (^/ or ^7 may work)", "Enter : Accept", NULL }; *************** *** 1207,1213 **** while (1) { /*** Add the labels ***/ wmove(tempwin, WinLines - 2, 2); ! waddstr(tempwin, "[Help: ^_] [Cancel: ^G]"); if (items[currentfield]->thing == CUR_CHOICE) waddstr(tempwin, " [Cycle Values: Space] [List Values: l]"); else --- 1227,1233 ---- while (1) { /*** Add the labels ***/ wmove(tempwin, WinLines - 2, 2); ! waddstr(tempwin, "[Help: ^-] [Cancel: ^G]"); if (items[currentfield]->thing == CUR_CHOICE) waddstr(tempwin, " [Cycle Values: Space] [List Values: l]"); else *************** *** 2121,2126 **** --- 2141,2148 ---- * then attempt a cleanup. */ if (!DidCleanup) { + fprintf(stderr,"\nPress RETURN to clean up and exit: "); + (void) getchar(); resetterm(); CleanupandExit(-1); } *************** *** 2178,2184 **** VMSsignal(SIGINT, SIG_IGN); status = spawn_DCLprocess(command); VMSsignal(SIGINT, controlc); ! return(status&1); } int --- 2200,2209 ---- VMSsignal(SIGINT, SIG_IGN); status = spawn_DCLprocess(command); VMSsignal(SIGINT, controlc); ! if ((status&1) != 1) ! return(-1); ! else ! return(0); } int *************** *** 2198,2207 **** --- 2223,2234 ---- if (command == "") status = lib$spawn(0); else { + #ifndef __ALPHA /* OpenVMS/AXP v6.1 still doesn't have the TRUSTED flag ;( */ if(VersionVMS[1] >= '6') /** Include TRUSTED flag **/ status = lib$spawn(&command_desc,0,0,&CLI$M_TRUSTED); else + #endif status = lib$spawn(&command_desc); } diff -c gopher+/gopher/CURcurses.h:3.17 gopher+/gopher/CURcurses.h:3.18 *** gopher+/gopher/CURcurses.h:3.17 Fri May 27 00:08:43 1994 --- gopher+/gopher/CURcurses.h Fri May 27 00:08:43 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.17 $ ! * $Date: 1994/04/13 19:14:31 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/CURcurses.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.18 $ ! * $Date: 1994/05/02 07:40:16 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/CURcurses.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: CURcurses.h,v $ + * Revision 3.18 1994/05/02 07:40:16 lindner + * Mods to use setlocale() + * * Revision 3.17 1994/04/13 19:14:31 lindner * AskL modifications * *************** *** 83,88 **** --- 86,92 ---- #ifndef CURCURSES_H #define CURCURSES_H + #include "Locale.h" #include <ctype.h> #ifdef __svr4__ diff -c gopher+/gopher/HTML.c:3.4 gopher+/gopher/HTML.c:removed *** gopher+/gopher/HTML.c:3.4 Fri May 27 00:08:43 1994 --- gopher+/gopher/HTML.c Fri May 27 00:08:43 1994 *************** *** 1,143 **** - /******************************************************************** - * $Author: lindner $ - * $Revision: 3.4 $ - * $Date: 1994/03/04 23:32:17 $ - * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/Attic/HTML.c,v $ - * $Status: $ - * - * Paul Lindner, University of Minnesota CIS. - * - * Copyright 1991, 1992 by the Regents of the University of Minnesota - * see the file "Copyright" in the distribution for conditions of use. - ********************************************************************* - * MODULE: HTML.c - * A lame attempt at doing HTML - ********************************************************************* - * Revision History: - * $Log: HTML.c,v $ - * Revision 3.4 1994/03/04 23:32:17 lindner - * mem fix - * - * Revision 3.3 1994/01/07 20:52:17 lindner - * pl11 - * - * Revision 3.2 1993/12/30 04:16:30 lindner - * Fix params for HTMLgrow (thanks protoize) - * - * Revision 3.1.1.1 1993/02/11 18:02:57 lindner - * Gopher+1.2beta release - * - * Revision 1.1 1992/12/10 23:32:16 lindner - * gopher 1.1 release - * - * Revision 1.1 1992/12/10 23:31:26 lindner - * gopher 1.1 release - * - * Revision 1.1 1992/12/10 06:16:51 lindner - * Initial revision - * - * - *********************************************************************/ - - - #include "HTML.h" - - #include <string.h> - #include <stdio.h> - - - HTMLObj * - HTMLnew(size) - int size; - { - HTMLObj *temp; - - temp = (HTMLObj*) malloc(sizeof(HTMLObj)); - - temp->Linkmaxsize = size; - temp->Linklinenum = (int *) malloc(size * sizeof(int)); - temp->Linklinepos = (int *) malloc(size * sizeof(int)); - - temp->Links = GDnew(size); - temp->Title = STRnew(); - - return(temp); - } - - - void - HTMLInit(html) - HTMLObj *html; - { - GDinit(html->Links); - STRinit(html->Title); - } - - void - HTMLDestroy(html) - HTMLObj *html; - { - GDdestroy(html->Links); - STRdestroy(html->Title); - - STRdestroy(html->Filehtmlname); - STRdestroy(html->Filetxtname); - - free(html->Linklinenum); - free(html->Linklinepos); - - free(html); - - } - - - void - HTMLgrow(html, size) - HTMLObj *html; - { - int *temp; - - if (size < html->Linkmaxsize) - return; - - temp = (int *) realloc(html->Linklinenum, size); - if (temp == NULL) - fprintf(stderr, "Out of memory!!!\n"), CleanupandExit(-1); - - if (temp != html->Linklinenum) - html->Linklinenum = temp; - - temp = (int *) realloc(html->Linklinepos, size); - if (temp == NULL) - fprintf(stderr, "Out of memory!!!\n"), CleanupandExit(-1); - - if (temp != html->Linklinepos) - html->Linklinepos = temp; - - } - - - void - HTMLaddLink(html, gs, linenum, offset) - HTMLObj *html; - GopherObj *gs; - int linenum; - int offset; - { - int top; - - if (html->Linkmaxsize == GDgetNumitems(html->Links)) { - html->Linkmaxsize *=2; - HTMLgrow(html->Linkmaxsize, html->Linkmaxsize); - } - - GDaddGS(html->Links, gs); - - top = GDgetNumitems(html->Links); - - HTMLSetLinepos(html, top-1, offset); - HTMLSetLinenum(html, top-1, linenum); - } - - - --- 0 ---- diff -c gopher+/gopher/HTML.h:3.1.1.1 gopher+/gopher/HTML.h:removed *** gopher+/gopher/HTML.h:3.1.1.1 Fri May 27 00:08:43 1994 --- gopher+/gopher/HTML.h Fri May 27 00:08:43 1994 *************** *** 1,67 **** - /******************************************************************** - * $Author: lindner $ - * $Revision: 3.1.1.1 $ - * $Date: 1993/02/11 18:02:57 $ - * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/Attic/HTML.h,v $ - * $Status: $ - * - * Paul Lindner, University of Minnesota CIS. - * - * Copyright 1991, 1992 by the Regents of the University of Minnesota - * see the file "Copyright" in the distribution for conditions of use. - ********************************************************************* - * MODULE: HTML.h - * Header file for lame attempt at HTML - ********************************************************************* - * Revision History: - * $Log: HTML.h,v $ - * Revision 3.1.1.1 1993/02/11 18:02:57 lindner - * Gopher+1.2beta release - * - * Revision 1.1 1992/12/10 23:32:16 lindner - * gopher 1.1 release - * - * Revision 1.1 1992/12/10 06:16:51 lindner - * Initial revision - * - * - *********************************************************************/ - - #include "GDgopherdir.h" - #include <stdio.h> - - struct HTMLstruct { - GopherDirObj *Links; - - int *Linklinenum; /** Line # of the link **/ - int *Linklinepos; /** line position of the link **/ - int Linkmaxsize; /** Size of Links arrays **/ - - FILE *Filehtml; - FILE *Filetxt; - - String *Filehtmlname; - String *Filetxtname; - - String *Title; - }; - - typedef struct HTMLstruct HTMLObj; - - #define HTMLGetLink(a,b) (GDgetEntry(((a)->Links),(b))) /** Returns a GopherObj**/ - #define HTMLGetLinepos(a,b) ((a)->Linklinepos[(b)]) - #define HTMLGetNumLinks(a) (GDgetNumitems((a)->Links)) - #define HTMLGetLinenum(a,b) ((a)->Linklinenum[(b)]) - #define HTMLGetLinkMax(a) ((a)->Linkmaxsize) - #define HTMLSetLinepos(a,b,c) ((a)->Linklinepos[(b)] = (c)) - #define HTMLSetLinenum(a,b,c) ((a)->Linklinenum[(b)] = (c)) - /** procedures defined in HTML.c **/ - - HTMLObj *HTMLnew( /*size*/); - void HTMLInit(); - void HTMLDestroy(); - void HTMLgrow(); - void HTMLaddLink(); - - - --- 0 ---- diff -c gopher+/gopher/Makefile:3.7 gopher+/gopher/Makefile:3.10 *** gopher+/gopher/Makefile:3.7 Fri May 27 00:08:43 1994 --- gopher+/gopher/Makefile Fri May 27 00:08:44 1994 *************** *** 1,7 **** #******************************************************************** # $Author: lindner $ ! # $Revision: 3.7 $ ! # $Date: 1994/02/20 16:17:43 $ # $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/Makefile,v $ # $State: Exp $ # --- 1,7 ---- #******************************************************************** # $Author: lindner $ ! # $Revision: 3.10 $ ! # $Date: 1994/05/26 19:41:14 $ # $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/Makefile,v $ # $State: Exp $ # *************** *** 15,20 **** --- 15,29 ---- #********************************************************************* # Revision History: # $Log: Makefile,v $ + # Revision 3.10 1994/05/26 19:41:14 lindner + # Add yet another definition + # + # Revision 3.9 1994/04/25 20:47:22 lindner + # Remove html stuff from menu + # + # Revision 3.8 1994/04/25 02:16:50 lindner + # Fix for last line without newline + # # Revision 3.7 1994/02/20 16:17:43 lindner # Add form object file # *************** *** 54,63 **** include ../Makefile.config OBJS = manager.o gopher.o globals.o ourutils.o cso.o \ ! subprocs.o html2.o HTML.o CURcurses.o hymoo.o gopherrc.o \ download.o pager.o form.o ! CCFLAGS = $(OPT) $(DEBUGGING) $(GSYSTYPE) $(INCLUDES) $(CLIENTOPTS) -DGOPHERHELP=\"$(CLIENTLIB)/gopher.hlp\" -DGLOBALRC=\"$(CLIENTLIB)/gopher.rc\" -DREMOTERC=\"$(CLIENTLIB)/gopherremote.rc\" TARGET = gopher --- 63,72 ---- include ../Makefile.config OBJS = manager.o gopher.o globals.o ourutils.o cso.o \ ! subprocs.o html2.o CURcurses.o gopherrc.o \ download.o pager.o form.o ! CCFLAGS = $(OPT) $(DEBUGGING) $(GSYSTYPE) $(INCLUDES) $(CLIENTOPTS) -DGOPHERLIB=\"$(CLIENTLIB)\" -DGOPHERHELP=\"$(CLIENTLIB)/gopher.hlp\" -DGLOBALRC=\"$(CLIENTLIB)/gopher.rc\" -DREMOTERC=\"$(CLIENTLIB)/gopherremote.rc\" TARGET = gopher *************** *** 87,90 **** $(OBJS): gopher.h ../conf.h globals.o: globals.h gopherrc.o: ../patchlevel.h ! manager.o: ../patchlevel.h --- 96,99 ---- $(OBJS): gopher.h ../conf.h globals.o: globals.h gopherrc.o: ../patchlevel.h ! manager.o: ../patchlevel.h diff -c gopher+/gopher/compile.com:3.12 gopher+/gopher/compile.com:3.14 *** gopher+/gopher/compile.com:3.12 Fri May 27 00:08:44 1994 --- gopher+/gopher/compile.com Fri May 27 00:08:44 1994 *************** *** 61,66 **** --- 61,67 ---- @compile MULTINET @compile CMUIP @compile NETLIB + @compile TCPWARE $ exit $ ENDIF $! *************** *** 67,72 **** --- 68,81 ---- $ ON CONTROL_Y THEN GOTO CLEANUP $ ON ERROR THEN GOTO CLEANUP $! + $ IF P1 .eqs. "TCPWARE" + $ THEN + $ write sys$output "Compiling client with UCX emulation..." + $ transport := "UCX" + $ ELSE + $ transport := "''P1'" + $ ENDIF + $! $ IF f$trnlnm("VAXCMSG") .eqs. "DECC$MSG" $ THEN $ vg1 = f$verify(1) *************** *** 74,85 **** $ define/nolog C$USER_INCLUDE [-],[-.object] $ define/nolog DECC$USER_INCLUDE [-],[-.object] $ vg1 = 'f$verify(0)' ! $ IF P1 .eqs. "UCX" $ THEN $ vg1 = f$verify(1) $ cc := cc/prefix=(all)- /warning=(disable=implicitfunc)- ! /define=('P1'=1,__VMS_CURSES) $ vg1 = 'f$verify(0)' $ ELSE $ vg1 = f$verify(1) --- 83,94 ---- $ define/nolog C$USER_INCLUDE [-],[-.object] $ define/nolog DECC$USER_INCLUDE [-],[-.object] $ vg1 = 'f$verify(0)' ! $ IF transport .eqs. "UCX" $ THEN $ vg1 = f$verify(1) $ cc := cc/prefix=(all)- /warning=(disable=implicitfunc)- ! /define=('transport'=1,__VMS_CURSES) $ vg1 = 'f$verify(0)' $ ELSE $ vg1 = f$verify(1) *************** *** 86,92 **** cc := cc/prefix=(all,except=(connect,gethostbyname,htons,inet_addr,- setsockopt,socket))- /warning=(disable=implicitfunc)- ! /define=('P1'=1,__VMS_CURSES) $ vg1 = 'f$verify(0)' $ ENDIF $ ELSE --- 95,101 ---- cc := cc/prefix=(all,except=(connect,gethostbyname,htons,inet_addr,- setsockopt,socket))- /warning=(disable=implicitfunc)- ! /define=('transport'=1,__VMS_CURSES) $ vg1 = 'f$verify(0)' $ ENDIF $ ELSE *************** *** 93,99 **** $ vg1 = f$verify(1) $! VAXC: $ cc := cc/include=([-],[-.object])- ! /define=('P1'=1) $ vg1 = 'f$verify(0)' $ ENDIF $ vg1 = f$verify(1) --- 102,108 ---- $ vg1 = f$verify(1) $! VAXC: $ cc := cc/include=([-],[-.object])- ! /define=('transport'=1) $ vg1 = 'f$verify(0)' $ ENDIF $ vg1 = f$verify(1) *************** *** 103,109 **** $ cc globals.c $ cc gopher.c $ cc gopherrc.c - $ cc html.c $ cc html2.c $ cc hymoo.c $ cc manager.c --- 112,117 ---- *************** *** 117,120 **** $ CLEANUP: $ vg1 = f$verify(vg) $exit - --- 125,127 ---- diff -c gopher+/gopher/cso.c:3.10 gopher+/gopher/cso.c:3.13 *** gopher+/gopher/cso.c:3.10 Fri May 27 00:08:44 1994 --- gopher+/gopher/cso.c Fri May 27 00:08:44 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.10 $ ! * $Date: 1994/03/04 23:35:17 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/cso.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.13 $ ! * $Date: 1994/05/19 14:07:22 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/cso.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: cso.c,v $ + * Revision 3.13 1994/05/19 14:07:22 lindner + * use fast malloc on VMS VAXC + * + * Revision 3.12 1994/05/17 05:47:53 lindner + * Massive internationalization change + * + * Revision 3.11 1994/05/14 04:13:38 lindner + * Internationalization... + * * Revision 3.10 1994/03/04 23:35:17 lindner * fix cso requester to be nice and big * *************** *** 64,69 **** --- 73,79 ---- #include "gopher.h" #include "fileio.h" + #include "Malloc.h" void do_cso(ZeGopher) *************** *** 77,83 **** int i; FileIO *sock; ! Draw_Status("Fetching Fields..."); refresh(); /*** Fetch the indexed fields from the server ***/ --- 87,93 ---- int i; FileIO *sock; ! Draw_Status(Gtxt("Fetching Fields...",87)); refresh(); /*** Fetch the indexed fields from the server ***/ *************** *** 144,150 **** return; } ! Draw_Status("Searching..."); refresh(); strcpy(query, "query "); --- 154,160 ---- return; } ! Draw_Status(Gtxt("Searching...",143)); refresh(); strcpy(query, "query "); diff -c gopher+/gopher/download.c:3.15 gopher+/gopher/download.c:3.19 *** gopher+/gopher/download.c:3.15 Fri May 27 00:08:45 1994 --- gopher+/gopher/download.c Fri May 27 00:08:45 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.15 $ ! * $Date: 1994/04/01 04:48:10 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/download.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.19 $ ! * $Date: 1994/05/17 05:47:54 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/download.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,32 ---- ********************************************************************* * Revision History: * $Log: download.c,v $ + * Revision 3.19 1994/05/17 05:47:54 lindner + * Massive internationalization change + * + * Revision 3.18 1994/05/14 04:13:39 lindner + * Internationalization... + * + * Revision 3.17 1994/05/06 02:26:31 lindner + * Fix for binhex downloads on vms and use dump command for binary files + * + * Revision 3.16 1994/04/25 20:48:19 lindner + * Proper casts + * * Revision 3.15 1994/04/01 04:48:10 lindner * Use FIOsystem() for downloading * *************** *** 123,129 **** "sx ", "kermit -q -i -s ", #ifdef VMS ! "type ", #else "cat -v ", #endif --- 135,141 ---- "sx ", "kermit -q -i -s ", #ifdef VMS ! "dump ", #else "cat -v ", #endif *************** *** 149,160 **** case A_TELNET: case A_TN3270: case A_INFO: ! CursesErrorMsg("Sorry, can't download that!"); return; } choice = CURChoice(CursesScreen, GSgetTitle(gs), DLnames, ! "Choose a download method", -1); if (choice == -1) return; --- 161,172 ---- case A_TELNET: case A_TN3270: case A_INFO: ! CursesErrorMsg(Gtxt("Sorry, can't download that!",150)); return; } choice = CURChoice(CursesScreen, GSgetTitle(gs), DLnames, ! Gtxt("Choose a download method",74), -1); if (choice == -1) return; *************** *** 190,201 **** getwd(curcwd); #ifdef VMS if (chdir("SYS$SCRATCH")!=0) { ! CursesErrorMsg("Can't write to SYS$SCRATCH!"); return; } #else if (chdir("/tmp")!=0) { ! CursesErrorMsg("Can't write to the /tmp directory!"); return; } #endif --- 202,213 ---- getwd(curcwd); #ifdef VMS if (chdir("SYS$SCRATCH")!=0) { ! CursesErrorMsg(Gtxt("Can't write to SYS$SCRATCH!",69)); return; } #else if (chdir("/tmp")!=0) { ! CursesErrorMsg(Gtxt("Can't write to the /tmp directory!",70)); return; } #endif *************** *** 216,244 **** /*** Check to see which method they're using to download ***/ if (stat(tmpfilename, &buf) < 0) { ! CursesErrorMsg("File didn't transfer successfully"); return; } /*** Now start the download ... ***/ ! switch (GSgetType(gs)) { ! case A_FILE: strcpy(command, DLcmds[choice]); ! break; ! default: strcpy(command, DLcmdB[choice]); ! } strcat(command, tmpfilename); CURexit(CursesScreen); if (choice == 5) { ! printf("Start your capture now...\n\n"); ! printf("Press <RETURN> when you're ready\n"); fflush(stdout); getchar(); } else { ! printf("Start your download now...\n"); fflush(stdout); } --- 228,254 ---- /*** Check to see which method they're using to download ***/ if (stat(tmpfilename, &buf) < 0) { ! CursesErrorMsg(Gtxt("File didn't transfer successfully",88)); return; } /*** Now start the download ... ***/ ! if (GSisText(gs, NULL)) strcpy(command, DLcmds[choice]); ! else strcpy(command, DLcmdB[choice]); ! strcat(command, tmpfilename); CURexit(CursesScreen); if (choice == 5) { ! printf(Gtxt("Start your capture now...\n\n",171)); ! printf(Gtxt("Press <RETURN> when you're ready\n",121)); fflush(stdout); getchar(); } else { ! printf(Gtxt("Start your download now...\n",172)); fflush(stdout); } *************** *** 245,263 **** start = time(NULL); if (FIOsystem(command)) ! printf("\nDownload could not be completed, sorry... \n"); else { end = time(NULL); if (end == start) end++; ! printf("\nDownload Complete. %d total bytes, %d bytes/sec\n", ! buf.st_size, buf.st_size/(end-start)); } unlink(tmpfilename); chdir(curcwd); ! printf("Press <RETURN> to continue"); fflush(stdout); getchar(); CURenter(CursesScreen); --- 255,273 ---- start = time(NULL); if (FIOsystem(command)) ! printf(Gtxt("\nDownload could not be completed, sorry... \n",183)); else { end = time(NULL); if (end == start) end++; ! printf(Gtxt("\nDownload Complete. %d total bytes, %d bytes/sec\n",182), ! (int)buf.st_size, ((int)buf.st_size)/(end-start)); } unlink(tmpfilename); chdir(curcwd); ! printf(Gtxt("Press <RETURN> to continue",121)); fflush(stdout); getchar(); CURenter(CursesScreen); diff -c gopher+/gopher/form.c:3.5 gopher+/gopher/form.c:3.6 *** gopher+/gopher/form.c:3.5 Fri May 27 00:08:45 1994 --- gopher+/gopher/form.c Fri May 27 00:08:45 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1994/04/01 02:24:56 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/form.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.6 $ ! * $Date: 1994/05/19 14:07:24 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/form.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: form.c,v $ + * Revision 3.6 1994/05/19 14:07:24 lindner + * use fast malloc on VMS VAXC + * * Revision 3.5 1994/04/01 02:24:56 lindner * Fix return types * *************** *** 39,44 **** --- 42,48 ---- #include "String.h" #include "GSgopherobj.h" #include "BLblock.h" + #include "Malloc.h" /** Make a new item... **/ diff -c gopher+/gopher/forms.h:3.1.1.1 gopher+/gopher/forms.h:removed *** gopher+/gopher/forms.h:3.1.1.1 Fri May 27 00:08:46 1994 --- gopher+/gopher/forms.h Fri May 27 00:08:46 1994 *************** *** 1,22 **** - /* - * This defines the form type. - */ - - struct form_struct { - int numfields; - char *Title; - char **tags; - char **values; - int *lengths; - int *xloc; - int *yloc; - }; - - typedef struct form_struct Form; - - /** Operations on Forms ***/ - - BOOLEAN NewForm(/* Form* */); - void ModifyForm(/* Form* */); - void DisplayForm(/* Form* */); - void PrintForm(/* Form * */); --- 0 ---- diff -c gopher+/gopher/globals.h:3.13 gopher+/gopher/globals.h:3.14 *** gopher+/gopher/globals.h:3.13 Fri May 27 00:08:46 1994 --- gopher+/gopher/globals.h Fri May 27 00:08:46 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.13 $ ! * $Date: 1994/03/04 23:36:33 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/globals.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.14 $ ! * $Date: 1994/05/17 05:47:55 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/globals.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: globals.h,v $ + * Revision 3.14 1994/05/17 05:47:55 lindner + * Massive internationalization change + * * Revision 3.13 1994/03/04 23:36:33 lindner * remove MAXRESP define * *************** *** 113,118 **** --- 116,125 ---- EXTERN char *Gopenfile INIT(NULL); EXTERN jmp_buf Jmpenv; + + #ifdef GINTERNATIONAL + nl_catd Gcatd; + #endif #ifndef VMS extern int errno; diff -c gopher+/gopher/gopher.c:3.70 gopher+/gopher/gopher.c:3.85 *** gopher+/gopher/gopher.c:3.70 Fri May 27 00:08:47 1994 --- gopher+/gopher/gopher.c Fri May 27 00:08:47 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.70 $ ! * $Date: 1994/04/13 19:12:50 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/gopher.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.85 $ ! * $Date: 1994/05/27 02:22:23 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/gopher.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,72 ---- ********************************************************************* * Revision History: * $Log: gopher.c,v $ + * Revision 3.85 1994/05/27 02:22:23 lindner + * One more fix for International defs + * + * Revision 3.84 1994/05/26 19:36:45 lindner + * Fix bugs for ginternational + * + * Revision 3.83 1994/05/26 19:15:22 lindner + * Add GINTERNATIONAL stuff + * + * Revision 3.82 1994/05/25 21:46:35 lindner + * Fix for suck_sound + * + * Revision 3.81 1994/05/25 21:38:17 lindner + * Fix for mem prob.. + * + * Revision 3.80 1994/05/25 20:59:42 lindner + * Fix for play command forking + * + * Revision 3.79 1994/05/24 07:00:38 lindner + * Don't allow users with rsh to specify a shell as an app.. + * + * Revision 3.78 1994/05/24 05:50:10 lindner + * Fix for bad free() in SetOptions() + * + * Revision 3.77 1994/05/19 15:53:34 lindner + * Fix for vms + * + * Revision 3.76 1994/05/19 14:07:25 lindner + * use fast malloc on VMS VAXC + * + * Revision 3.75 1994/05/18 03:59:25 lindner + * Change to FIOsystem() for VMS + * + * Revision 3.74 1994/05/17 05:47:57 lindner + * Massive internationalization change + * + * Revision 3.73 1994/05/14 04:13:41 lindner + * Internationalization... + * + * Revision 3.72 1994/04/25 04:05:24 lindner + * FIOsystem() return values were reversed for VMS. + * + * Added code for mapping telnet and/or tn3270 commands to "- none -" for + * disabling them and having the client issue "Sorry, not implemented" + * messages on efforts to use Type 8 or T tuples. + * + * Added FIOsystem() failure messages for both VMS and Unix. (all from + * F.Macrides) + * + * Revision 3.71 1994/04/25 03:37:38 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.70 1994/04/13 19:12:50 lindner * Fix for ASK block bug * *************** *** 330,335 **** --- 382,388 ---- #include <errno.h> #include "fileio.h" + #include "Malloc.h" void describe_gopher(); extern int twirl(); *************** *** 358,379 **** #ifdef VMS refresh(); #endif ! Dialogmess[0] = "Warning!!!!!, you are about to leave the Internet"; ! Dialogmess[1] = "Gopher program and connect to another host. If"; ! Dialogmess[2] = "you get stuck press the control key and the"; #if defined(VMS) && defined(MULTINET) ! Dialogmess[3] = "^ key, and then type q."; #else ! Dialogmess[3] = "] key, and then type quit"; #endif Dialogmess[4] = ""; if (GSgetPort(ZeGopher) != 0) ! sprintf(sMessage1,"Connecting to %.40s, port %d using %s.", GSgetHost(ZeGopher),GSgetPort(ZeGopher), (GSgetType(ZeGopher) == A_TN3270) ? "tn3270" : "telnet"); else ! sprintf(sMessage1, "Connecting to %.40s using %s.", GSgetHost(ZeGopher), (GSgetType(ZeGopher) == A_TN3270) ? "tn3270" : "telnet"); --- 411,432 ---- #ifdef VMS refresh(); #endif ! Dialogmess[0] = Gtxt("Warning!!!!!, you are about to leave the Internet",34); ! Dialogmess[1] = Gtxt("Gopher program and connect to another host. If",35); ! Dialogmess[2] = Gtxt("you get stuck press the control key and the",36); #if defined(VMS) && defined(MULTINET) ! Dialogmess[3] = Gtxt("^ key, and then type q.",38); #else ! Dialogmess[3] = Gtxt("] key, and then type quit",37); #endif Dialogmess[4] = ""; if (GSgetPort(ZeGopher) != 0) ! sprintf(sMessage1,Gtxt("Connecting to %.40s, port %d using %s.",39), GSgetHost(ZeGopher),GSgetPort(ZeGopher), (GSgetType(ZeGopher) == A_TN3270) ? "tn3270" : "telnet"); else ! sprintf(sMessage1, Gtxt("Connecting to %.40s using %s.",40), GSgetHost(ZeGopher), (GSgetType(ZeGopher) == A_TN3270) ? "tn3270" : "telnet"); *************** *** 381,387 **** cp = GSgetPath(ZeGopher); if (*cp != '\0') ! sprintf(sMessage2,"Use the account name \"%.40s\" to log in", GSgetPath(ZeGopher)); else sMessage2[0] = '\0'; --- 434,441 ---- cp = GSgetPath(ZeGopher); if (*cp != '\0') ! sprintf(sMessage2, ! Gtxt("Use the account name \"%.40s\" to log in",41), GSgetPath(ZeGopher)); else sMessage2[0] = '\0'; *************** *** 441,447 **** GSgetginfo(gs, TRUE); if (!GSisGplus(gs) || GSgetAdmin(gs) == NULL) { ! CursesErrorMsg("Can't find an administrator for this item, sorry!"); return; } --- 495,502 ---- GSgetginfo(gs, TRUE); if (!GSisGplus(gs) || GSgetAdmin(gs) == NULL) { ! CursesErrorMsg( ! Gtxt("Can't find an administrator for this item, sorry!",48)); return; } *************** *** 466,476 **** for (i=0; i < 3; i++) gripemess[i] = NULL; ! gripeprompt[0] = "Hit the Tab key at the end of each line you type."; ! gripeprompt[1] = "Hit the Enter key to send your message."; gripeprompt[2] = ""; ! gripeprompt[3] = "Subject"; ! gripeprompt[4] = "Problem"; gripeprompt[14] = NULL; if (CURRequest(CursesScreen, GSgetAdmin(gs), gripeprompt, gripemess)!=0) { --- 521,531 ---- for (i=0; i < 3; i++) gripemess[i] = NULL; ! gripeprompt[0] = Gtxt("Hit the Tab key at the end of each line you type.",49); ! gripeprompt[1] = Gtxt("Hit the Enter key to send your message.",50); gripeprompt[2] = ""; ! gripeprompt[3] = Gtxt("Subject",51); ! gripeprompt[4] = Gtxt("Problem",52); gripeprompt[14] = NULL; if (CURRequest(CursesScreen, GSgetAdmin(gs), gripeprompt, gripemess)!=0) { *************** *** 486,492 **** tmpfilename = tempnam(NULL,NULL); if ((f = fopen(tmpfilename, "w")) == NULL) { ! CursesErrorMsg("Cannot send mail..."); return; } --- 541,547 ---- tmpfilename = tempnam(NULL,NULL); if ((f = fopen(tmpfilename, "w")) == NULL) { ! CursesErrorMsg(Gtxt("Cannot send mail...",53)); return; } *************** *** 500,507 **** fclose(f); CURexit(CursesScreen); ! printf("Mailing gripe to %s...", MailAddress); ! system(mailcmd); unlink(tmpfilename); free(tmpfilename); CURenter(CursesScreen); --- 555,562 ---- fclose(f); CURexit(CursesScreen); ! printf(Gtxt("Mailing gripe to %s...",54), MailAddress); ! FIOsystem(mailcmd); unlink(tmpfilename); free(tmpfilename); CURenter(CursesScreen); *************** *** 514,520 **** fio = FIOopenProcess(mailargv[0], mailargv, "w"); if (fio == NULL) { ! CursesErrorMsg("Cannot send mail..."); return; } --- 569,575 ---- fio = FIOopenProcess(mailargv[0], mailargv, "w"); if (fio == NULL) { ! CursesErrorMsg(Gtxt("Cannot send mail...",53)); return; } *************** *** 554,560 **** *inputline = '\0'; } ! prompt[0] = "Words to search for"; prompt[1] = NULL; response[0] = inputline; --- 609,615 ---- *inputline = '\0'; } ! prompt[0] = Gtxt("Words to search for",55); prompt[1] = NULL; response[0] = inputline; *************** *** 591,603 **** !strncasecmp(playCmd, "- none -", 8) || playCmd == NULL || playCmd[0] == '\0') { /*** Hey! no play command, bummer ***/ ! CursesErrorMsg("Sorry, this machine doesn't support sounds"); return; } ! Play = FIOopenCmdline(playCmd, "w"); ! while(1) { j = read(sockfd, buf, BUFSIZE); --- 646,659 ---- !strncasecmp(playCmd, "- none -", 8) || playCmd == NULL || playCmd[0] == '\0') { /*** Hey! no play command, bummer ***/ ! /** We're forked at this point, and we can't display anything.. **/ ! /* CursesErrorMsg(Gtxt("Sorry, this machine doesn't support sounds",159));*/ return; } ! Play = FIOopenCmdline(playCmd, "w"); ! while(1) { j = read(sockfd, buf, BUFSIZE); *************** *** 620,626 **** GopherStruct *ZeGopher; { #ifdef VMS ! CursesErrorMsg("Sorry, this machine doesn't support sounds"); #else int sockfd; BOOLEAN Waitforchld = FALSE; --- 676,682 ---- GopherStruct *ZeGopher; { #ifdef VMS ! CursesErrorMsg(Gtxt("Sorry, this machine doesn't support sounds",159)); #else int sockfd; BOOLEAN Waitforchld = FALSE; *************** *** 665,671 **** do_movie(ZeGopher) GopherStruct *ZeGopher; { ! CursesErrorMsg("Movie viewing not yet implemented"); } --- 721,727 ---- do_movie(ZeGopher) GopherStruct *ZeGopher; { ! CursesErrorMsg(Gtxt("Movie viewing not yet implemented",108)); } *************** *** 699,705 **** if (!RCdisplayCommand(GlobalRC, view, "", inputline) || !strncasecmp(inputline, "- none -", 8) || inputline == NULL || inputline[0] == '\0') { ! CursesErrorMsg("No display command is mapped to this view!"); return; } Debug("showfile:inputline=%s\n",inputline); --- 755,761 ---- if (!RCdisplayCommand(GlobalRC, view, "", inputline) || !strncasecmp(inputline, "- none -", 8) || inputline == NULL || inputline[0] == '\0') { ! CursesErrorMsg(Gtxt("No display command is mapped to this view!",113)); return; } Debug("showfile:inputline=%s\n",inputline); *************** *** 711,721 **** if (*inputline == '|') { #ifdef VMS ! CursesErrorMsg("Unix piping requested. Check your configuration!"); return; #endif if ((tmpfile = popen(inputline+1, "w")) == NULL) ! fprintf(stderr, "Couldn't execute %s\n",inputline), CleanupandExit(-1); WritePipe = TRUE; CURexit(CursesScreen); } else { --- 767,778 ---- if (*inputline == '|') { #ifdef VMS ! CursesErrorMsg(Gtxt("Unix piping requested. Check your configuration!",176)); return; #endif if ((tmpfile = popen(inputline+1, "w")) == NULL) ! fprintf(stderr, Gtxt("Couldn't execute %s\n",81) ! ,inputline), CleanupandExit(-1); WritePipe = TRUE; CURexit(CursesScreen); } else { *************** *** 741,747 **** if ((tmpfile = fopen(tmpfilename, "w")) == NULL) { #endif CURexit(CursesScreen); ! fprintf(stderr, "Couldn't make a tmp file!\n"), CleanupandExit(-1); } if (GSgetLocalFile(ZeGopher) != NULL && --- 798,804 ---- if ((tmpfile = fopen(tmpfilename, "w")) == NULL) { #endif CURexit(CursesScreen); ! fprintf(stderr, Gtxt("Couldn't make a tmp file!\n",83)), CleanupandExit(-1); } if (GSgetLocalFile(ZeGopher) != NULL && *************** *** 877,889 **** DispStrings[3] = NULL; if (sockfd <0) { ! sprintf(DispString, "Cannot connect to host %.40s, port %d.", host, port); switch (sockfd) { case -2: ! DispStrings[2] = "Hostname is unknown."; break; case -3: ! DispStrings[2] = "Unable to allocate a socket."; break; case -4: #if defined(VMS) && defined(MULTINET) --- 934,949 ---- DispStrings[3] = NULL; if (sockfd <0) { ! sprintf(DispString, ! Gtxt("Cannot connect to host %.40s, port %d.",72), ! host, port); ! switch (sockfd) { case -2: ! DispStrings[2] = Gtxt("Hostname is unknown.",100); break; case -3: ! DispStrings[2] = Gtxt("Unable to allocate a socket.",175); break; case -4: #if defined(VMS) && defined(MULTINET) *************** *** 891,897 **** DispStrings[2] = DispString2; #else if (errno > 0 && errno <= sys_nerr) { ! sprintf(DispString2, "Connection failed: %s.", #ifdef VMS strerror(errno)); #else --- 951,957 ---- DispStrings[2] = DispString2; #else if (errno > 0 && errno <= sys_nerr) { ! sprintf(DispString2, Gtxt("Connection failed: %s.",78), #ifdef VMS strerror(errno)); #else *************** *** 899,909 **** #endif DispStrings[2] = DispString2; } else ! DispStrings[2] = "Connection to remote host failed."; #endif break; default: ! DispStrings[2] = "Unknown error."; } DispStrings[0] = DispString; DispStrings[1] = ""; --- 959,970 ---- #endif DispStrings[2] = DispString2; } else ! DispStrings[2] = ! Gtxt("Connection to remote host failed.",79); #endif break; default: ! DispStrings[2] = Gtxt("Unknown error.",177); } DispStrings[0] = DispString; DispStrings[1] = ""; *************** *** 911,917 **** CURBeep(CursesScreen); ! CURDialog(CursesScreen, "Network Error", DispStrings); } } --- 972,978 ---- CURBeep(CursesScreen); ! CURDialog(CursesScreen, Gtxt("Network Error",110), DispStrings); } } *************** *** 924,930 **** yesno[0] = 'y'; yesno[1] = '\0'; ! CURgetYesorNo(CursesScreen, "Really quit (y/n) ?", yesno); if (*yesno == 'y') { return(TRUE); } --- 985,991 ---- yesno[0] = 'y'; yesno[1] = '\0'; ! CURgetYesorNo(CursesScreen, Gtxt("Really quit (y/n) ?",124), yesno); if (*yesno == 'y') { return(TRUE); } *************** *** 988,995 **** if (CurrentDir == NULL || GDgetNumitems(CurrentDir) <= 0) { CURexit(CursesScreen); ! fprintf(stderr, ! "gopher: Nothing received for main menu, can't continue\n"); CleanupandExit(1); } --- 1049,1055 ---- if (CurrentDir == NULL || GDgetNumitems(CurrentDir) <= 0) { CURexit(CursesScreen); ! fprintf(stderr,Gtxt("gopher: Nothing received for main menu, can't continue\n",60)); CleanupandExit(1); } *************** *** 1074,1080 **** Initialize() { ! Debug("Initialize\n",NULL) GlobalRC = RCnew(); /** get defaults from the rc file **/ --- 1134,1140 ---- Initialize() { ! Debugmsg("Initialize\n") GlobalRC = RCnew(); /** get defaults from the rc file **/ *************** *** 1087,1093 **** CursesScreen = CURnew(); if (strcmp(CURgetTerm(CursesScreen), "unknown")==0) ! fprintf(stderr, "I don't understand your terminal type\n"), CleanupandExit(-1); --- 1147,1153 ---- CursesScreen = CURnew(); if (strcmp(CURgetTerm(CursesScreen), "unknown")==0) ! fprintf(stderr, Gtxt("I don't understand your terminal type\n",101)), CleanupandExit(-1); *************** *** 1121,1130 **** perror("signal died:\n"), CleanupandExit(-1); - /*** Initialize international languages ***/ - #ifdef LC_ALL - setlocale(LC_ALL, ""); - #endif /*** Init MainWindow ****/ --- 1181,1186 ---- *************** *** 1137,1172 **** * This stuff will set the options in a nice way... */ - static char *OptionMenu[] = - {"General Options", - "Configure Display Applications", - "Configure Printing Applications", - "Define New Content-Type", - NULL - }; - - static char *OptionNewApp[] = - {"Content-Type Name", - "Display Application", - "Printing Application", - NULL - }; - - static char *noyes[] = {"No", "Yes", NULL}; - void SetOptions() { ! int choice; ! if (SecureMode || NoShellMode) { ! CursesErrorMsg("Sorry, you are not allowed to set options in secure mode."); return; } /** Display Configuration Menu and allow user to choose **/ ! choice = CURChoice(CursesScreen, "Gopher Options", OptionMenu, ! "Your Choice", -1); if (choice == -1) return; --- 1193,1250 ---- * This stuff will set the options in a nice way... */ void SetOptions() { ! int choice, restricted; ! char *shell; ! static char **OptionNewApp = NULL, **OptionsMenu = NULL; ! static char **noyes = NULL; ! ! if (OptionNewApp == NULL) { ! OptionNewApp = (char**) malloc(sizeof(char*) * 4); ! OptionNewApp[0] = Gtxt("Content-Type Name",27); ! OptionNewApp[1] = Gtxt("Display Application",28); ! OptionNewApp[2] = Gtxt("Printing Application",29), ! OptionNewApp[3] = NULL; ! } ! ! if (OptionsMenu == NULL) { ! OptionsMenu = (char **) malloc(sizeof(char*) * 5); ! OptionsMenu[0] = Gtxt("General Options",30); ! OptionsMenu[1] = Gtxt("Configure Display Applications",31); ! OptionsMenu[2] = Gtxt("Configure Printing Applications",32); ! OptionsMenu[3] = Gtxt("Define New Content-Type",33); ! OptionsMenu[4] = NULL; ! } ! if (noyes == NULL) { ! noyes = (char**) malloc(sizeof(char*) * 3); ! noyes[0] = Gtxt("No",111); ! noyes[1] = Gtxt("Yes",180); ! noyes[2] = NULL; ! } ! ! ! /* ! * If the user is running a restricted shell, don't allow him/her to ! * set applications, because he/she can specify a shell. This is ! * independent of -s and -S because rsh users may have a shell. ! */ ! #ifndef VMS ! restricted = (shell = getenv("SHELL")) == NULL ! || strcmp(shell+strlen(shell) - 3, "rsh") == 0; ! ! #endif ! ! if (SecureMode || NoShellMode || restricted) { ! CursesErrorMsg(Gtxt("Sorry, you are not allowed to set options in secure mode.",163)); return; } /** Display Configuration Menu and allow user to choose **/ ! choice = CURChoice(CursesScreen, Gtxt("Gopher Options",94), OptionsMenu, ! Gtxt("Your Choice",181), -1); if (choice == -1) return; *************** *** 1180,1186 **** Requestitem *items[2]; Requestitem item; ! item.prompt = "Bold Search words in Builtin Pager"; item.thing = CUR_CHOICE; item.choices = noyes; item.chooseitem = RCsearchBolding(GlobalRC); --- 1258,1264 ---- Requestitem *items[2]; Requestitem item; ! item.prompt = Gtxt("Bold Search words in Builtin Pager",66); item.thing = CUR_CHOICE; item.choices = noyes; item.chooseitem = RCsearchBolding(GlobalRC); *************** *** 1225,1233 **** Responses[i] = NULL; if (choice == 1) ! zetitle = "Configure Display Applications"; else ! zetitle = "Configure Printing Applications"; if (CURRequest(CursesScreen, zetitle, gplusviews, Responses) == 0) { --- 1303,1311 ---- Responses[i] = NULL; if (choice == 1) ! zetitle = Gtxt("Configure Display Applications",31); else ! zetitle = Gtxt("Configure Printing Applications",32); if (CURRequest(CursesScreen, zetitle, gplusviews, Responses) == 0) { *************** *** 1250,1256 **** } for (i = 0 ; i <= numoptions; i++) ! free(Responses[i]); free(Responses); free(gplusviews); --- 1328,1335 ---- } for (i = 0 ; i <= numoptions; i++) ! if (Responses[i]) ! free(Responses[i]); free(Responses); free(gplusviews); *************** *** 1271,1277 **** } Responses[3] = NULL; ! if ((CURRequest(CursesScreen, "Define New Content-Type", OptionNewApp, Responses) == 0) && (*Responses[0] != '\0')) { char tmpstr[512]; --- 1350,1356 ---- } Responses[3] = NULL; ! if ((CURRequest(CursesScreen, Gtxt("Define New Content-Type",33), OptionNewApp, Responses) == 0) && (*Responses[0] != '\0')) { char tmpstr[512]; *************** *** 1313,1324 **** boolean Bkmarksfirst = FALSE; #ifdef VMS ! argv[0] = "gopher"; #endif - /* DEBUG=TRUE; */ - Debug("main:A\r\n",NULL) for (i=0; i<2; i++) { RootGophers[i] = GSnew(); GSsetType (RootGophers[i], A_DIRECTORY); --- 1392,1415 ---- boolean Bkmarksfirst = FALSE; + /*** Initialize international languages ***/ + setlocale(LC_ALL, ""); + #if defined(GINTERNATIONAL) + Gtxtopen(Gcatd,"gopher.cat", 0); + if (Gcatd == (nl_catd) -1) { + /** Try finding it elsewhere.. **/ + char fname[256]; + if (getenv("LANG") != NULL) { + sprintf(fname, "%s/gophernls/%s.cat", GOPHERLIB, getenv("LANG")); + Gtxtopen(Gcatd, fname,0); + } + } + #endif + #ifdef VMS ! argv[0] = "gopher"; #endif for (i=0; i<2; i++) { RootGophers[i] = GSnew(); GSsetType (RootGophers[i], A_DIRECTORY); *************** *** 1325,1331 **** GSsetPath (RootGophers[i],""); } - Debug("main:B\r\n",NULL) /** Should generalize this to >2 hosts .... Sigh... ***/ GSsetHost (RootGophers[0], CLIENT1_HOST); GSsetPort (RootGophers[0], CLIENT1_PORT); --- 1416,1421 ---- *************** *** 1338,1343 **** --- 1428,1434 ---- sTmp[0] = '\0'; + while ((c = getopt(argc, argv, "DsSbrp:t:T:i:")) != -1) switch (c) { case 's': *************** *** 1365,1371 **** break; case 'D': DEBUG = TRUE; ! Debug("gopher starting - debug on\n",NULL) break; case 'r': RemoteUser = TRUE; --- 1456,1462 ---- break; case 'D': DEBUG = TRUE; ! Debugmsg("gopher starting - debug on\n") break; case 'r': RemoteUser = TRUE; *************** *** 1380,1394 **** if (errflag) { ! fprintf(stderr, "Usage: %s [-sSbDr] [-T type] [-p path] [-t title] [hostname port]+\n", argv[0]); ! fprintf(stderr, " -s secure mode, users without own account\n"); ! fprintf(stderr, " -S secure mode, users with own account\n"); ! fprintf(stderr, " -p path specify path to initial item\n"); ! fprintf(stderr, " -T type Type of initial item\n"); ! fprintf(stderr, " -i Search argument (for -T 7)\n"); ! fprintf(stderr, " -b Bookmarks first\n"); ! fprintf(stderr, " -r Remote user\n"); ! fprintf(stderr, " -D Debug mode\n"); CleanupandExit(-1); } --- 1471,1493 ---- if (errflag) { ! fprintf(stderr, Gtxt("Usage: %s [-sSbDr] [-T type] [-p path] [-t title] [hostname port]+\n",9), argv[0]); ! fprintf(stderr, ! Gtxt(" -s secure mode, users without own account\n",10)); ! fprintf(stderr, ! Gtxt(" -S secure mode, users with own account\n",11)); ! fprintf(stderr, ! Gtxt(" -p path specify path to initial item\n",12)); ! fprintf(stderr, ! Gtxt(" -T type Type of initial item\n",13)); ! fprintf(stderr, ! Gtxt(" -i Search argument (for -T 7)\n",14)); ! fprintf(stderr, ! Gtxt(" -b Bookmarks first\n",15)); ! fprintf(stderr, ! Gtxt(" -r Remote user\n",16)); ! fprintf(stderr, ! Gtxt(" -D Debug mode\n",17)); CleanupandExit(-1); } *************** *** 1419,1427 **** /*** If the title hasn't been set, then add a default title **/ if (GSgetTitle(RootGophers[0]) == NULL) { ! sprintf(sTmp, "Root gopher server: %.59s", GSgetHost(RootGophers[0])); GSsetTitle(RootGophers[0], sTmp); ! sprintf(sTmp, "Root gopher server: %.59s", GSgetHost(RootGophers[1])); GSsetTitle(RootGophers[1], sTmp); } --- 1518,1528 ---- /*** If the title hasn't been set, then add a default title **/ if (GSgetTitle(RootGophers[0]) == NULL) { ! sprintf(sTmp, Gtxt("Home Gopher server: %.59s",97), ! GSgetHost(RootGophers[0])); GSsetTitle(RootGophers[0], sTmp); ! sprintf(sTmp, Gtxt("Home Gopher server: %.59s",97), ! GSgetHost(RootGophers[1])); GSsetTitle(RootGophers[1], sTmp); } *************** *** 1451,1461 **** #ifdef DEBUGGING if (CurrentDir == NULL) { ! Debug("CurrentDir=NULL\n",NULL); } else if (GDgetNumitems(CurrentDir) <=0) { ! Debug("GDgetNumitems<=0\n", NULL); } #endif --- 1552,1562 ---- #ifdef DEBUGGING if (CurrentDir == NULL) { ! Debugmsg("CurrentDir=NULL\n"); } else if (GDgetNumitems(CurrentDir) <=0) { ! Debugmsg("GDgetNumitems<=0\n"); } #endif *************** *** 1469,1475 **** */ while (optind < argc && CurrentDir == NULL) { ! Debug("Trying alternate site\n",0); GSsetHost(RootGophers[0], argv[optind]); optind++; GSsetPort(RootGophers[0], atoi(argv[optind])); --- 1570,1576 ---- */ while (optind < argc && CurrentDir == NULL) { ! Debugmsg("Trying alternate site\n"); GSsetHost(RootGophers[0], argv[optind]); optind++; GSsetPort(RootGophers[0], atoi(argv[optind])); *************** *** 1481,1496 **** if (CurrentDir == NULL || GDgetNumitems(CurrentDir) <= 0) { #ifdef DEBUGGING if (CurrentDir == NULL) { ! Debug("B: CurrentDir=NULL\n",0); } else if (GDgetNumitems(CurrentDir) <=0) { ! Debug("B: GDgetNumitems<=0\n",0); } #endif CURexit(CursesScreen); fprintf(stderr, ! "%s: Nothing received for main menu, can't continue\n", argv[0]); CleanupandExit(1); } --- 1582,1598 ---- if (CurrentDir == NULL || GDgetNumitems(CurrentDir) <= 0) { #ifdef DEBUGGING if (CurrentDir == NULL) { ! Debugmsg("B: CurrentDir=NULL\n"); } else if (GDgetNumitems(CurrentDir) <=0) { ! Debugmsg("B: GDgetNumitems<=0\n"); } #endif CURexit(CursesScreen); fprintf(stderr, ! Gtxt("%s: Nothing received for main menu, can't continue\n",188) ! , argv[0]); CleanupandExit(1); } *************** *** 1555,1561 **** case 's': /*** Save a file directly ***/ if (SecureMode || NoShellMode) { ! CursesErrorMsg("Sorry, can't save files in securemode"); break; } Save_file(GDgetEntry(CurrentDir,GDgetCurrentItem(CurrentDir)-1), NULL, NULL); --- 1657,1663 ---- case 's': /*** Save a file directly ***/ if (SecureMode || NoShellMode) { ! CursesErrorMsg(Gtxt("Sorry, can't save files with this account",152)); break; } Save_file(GDgetEntry(CurrentDir,GDgetCurrentItem(CurrentDir)-1), NULL, NULL); *************** *** 1563,1569 **** case 'S': /*** Save list of menu items (objects) to a file ***/ if (SecureMode || NoShellMode) { ! CursesErrorMsg("Sorry, can't save files in securemode"); break; } Save_list(CurrentDir); --- 1665,1671 ---- case 'S': /*** Save list of menu items (objects) to a file ***/ if (SecureMode || NoShellMode) { ! CursesErrorMsg(Gtxt("Sorry, can't save files with this account",152)); break; } Save_list(CurrentDir); *************** *** 1581,1593 **** int i; if (SecureMode) { ! CursesErrorMsg("Sorry, you're not allowed to do this"); break; } ! prompts[0]="Hostname"; ! prompts[1]="Port"; ! prompts[2]="Selector (Optional)"; prompts[3]=NULL; for (i=0; i<3; i++) { --- 1683,1695 ---- int i; if (SecureMode) { ! CursesErrorMsg(Gtxt("Sorry, you're not allowed to do this",164)); break; } ! prompts[0]=Gtxt("Hostname",99); ! prompts[1]=Gtxt("Port",118); ! prompts[2]=Gtxt("Selector (Optional)",144); prompts[3]=NULL; for (i=0; i<3; i++) { *************** *** 1598,1605 **** responses[3] = NULL; ! if ((CURRequest(CursesScreen, "Connect to a new Gopher Server", ! prompts, responses) != -1) && *responses[0]!='\0') { GSsetType(tempgs, A_DIRECTORY); GSsetTitle(tempgs, responses[0]); --- 1700,1709 ---- responses[3] = NULL; ! if ((CURRequest(CursesScreen, ! Gtxt("Connect to a new Gopher Server",75), ! prompts, responses) != -1) ! && *responses[0]!='\0') { GSsetType(tempgs, A_DIRECTORY); GSsetTitle(tempgs, responses[0]); *************** *** 1625,1636 **** int i; if (SecureMode) { ! CursesErrorMsg("Sorry, you're not allowed to do this"); break; } ! prompts[0]="anonymous FTP Host"; ! prompts[1]="Selector (Optional)"; prompts[2]=NULL; for (i=0; i<2; i++) { --- 1729,1740 ---- int i; if (SecureMode) { ! CursesErrorMsg(Gtxt("Sorry, you're not allowed to do this",164)); break; } ! prompts[0]=Gtxt("anonymous FTP Host",187); ! prompts[1]=Gtxt("Selector (Optional)",144); prompts[2]=NULL; for (i=0; i<2; i++) { *************** *** 1641,1647 **** responses[2] = NULL; if ((CURRequest(CursesScreen, ! "Connect to an anonymous FTP Server via the Gopher gateway", prompts, responses) == -1) || *responses[0] == '\0') break; --- 1745,1751 ---- responses[2] = NULL; if ((CURRequest(CursesScreen, ! Gtxt("Connect to an anonymous FTP Server via the Gopher gateway",76), prompts, responses) == -1) || *responses[0] == '\0') break; *************** *** 1669,1675 **** GopherObj *tempgs; if (SecureMode) { ! CursesErrorMsg("Sorry, you're not allowed to do this"); break; } --- 1773,1779 ---- GopherObj *tempgs; if (SecureMode) { ! CursesErrorMsg(Gtxt("Sorry, you're not allowed to do this",164)); break; } *************** *** 1691,1697 **** GDgetCurrentItem(CurrentDir)-1)); GSsetType(tempgs, A_DIRECTORY); ! GSsetTitle(tempgs, "Root menu: "); STRcat(tempgs->Title, GSgetHost(tempgs)); GSsetPath(tempgs, NULL); --- 1795,1801 ---- GDgetCurrentItem(CurrentDir)-1)); GSsetType(tempgs, A_DIRECTORY); ! GSsetTitle(tempgs, Gtxt("Root menu: ",135)); STRcat(tempgs->Title, GSgetHost(tempgs)); GSsetPath(tempgs, NULL); *************** *** 1705,1711 **** GopherObj *tempgs; if (SecureMode) { ! CursesErrorMsg("Sorry, you're not allowed to do this"); break; } --- 1809,1815 ---- GopherObj *tempgs; if (SecureMode) { ! CursesErrorMsg(Gtxt("Sorry, you're not allowed to do this",164)); break; } *************** *** 1720,1726 **** GDgetCurrentItem(OldDirs[iLevel-1])-1)); GSsetType(tempgs, A_DIRECTORY); ! GSsetTitle(tempgs, "Root menu: "); STRcat(tempgs->Title, GSgetHost(tempgs)); GSsetPath(tempgs, NULL); --- 1824,1830 ---- GDgetCurrentItem(OldDirs[iLevel-1])-1)); GSsetType(tempgs, A_DIRECTORY); ! GSsetTitle(tempgs, Gtxt("Root menu: ",135)); STRcat(tempgs->Title, GSgetHost(tempgs)); GSsetPath(tempgs, NULL); *************** *** 1734,1740 **** logrequest("VIEW BOOKMARKS", NULL); if (RCgetBookmarkDir(GlobalRC) == NULL) { ! CursesErrorMsg("No bookmarks are defined"); break; } --- 1838,1844 ---- logrequest("VIEW BOOKMARKS", NULL); if (RCgetBookmarkDir(GlobalRC) == NULL) { ! CursesErrorMsg(Gtxt("No bookmarks are defined",112)); break; } *************** *** 1760,1766 **** if (RCgetBookmarkDir(GlobalRC) == NULL) { RCsetBookmarkDir(GlobalRC,GDnew(32)); ! GDsetTitle(RCgetBookmarkDir(GlobalRC), "Bookmarks"); } tmpgs = GSnew(); --- 1864,1870 ---- if (RCgetBookmarkDir(GlobalRC) == NULL) { RCsetBookmarkDir(GlobalRC,GDnew(32)); ! GDsetTitle(RCgetBookmarkDir(GlobalRC), Gtxt("Bookmarks",67)); } tmpgs = GSnew(); *************** *** 1768,1774 **** strcpy(newtitle, GSgetTitle(tmpgs)); if (CURGetOneOption(CursesScreen, newtitle, ! "Name for this bookmark:", newtitle)==0) { if (*newtitle != '\0') { GSsetTitle(tmpgs, newtitle); GDaddGS(RCgetBookmarkDir(GlobalRC), tmpgs); --- 1872,1878 ---- strcpy(newtitle, GSgetTitle(tmpgs)); if (CURGetOneOption(CursesScreen, newtitle, ! Gtxt("Name for this bookmark:",109), newtitle)==0) { if (*newtitle != '\0') { GSsetTitle(tmpgs, newtitle); GDaddGS(RCgetBookmarkDir(GlobalRC), tmpgs); *************** *** 1790,1800 **** if (RCgetBookmarkDir(GlobalRC) == NULL) { RCsetBookmarkDir(GlobalRC,GDnew(32)); ! GDsetTitle(RCgetBookmarkDir(GlobalRC), "Bookmarks"); } if (CurrentDir == RCgetBookmarkDir(GlobalRC)) { ! CursesErrorMsg("Sorry, can't make a bookmark of bookmarks"); break; } --- 1894,1904 ---- if (RCgetBookmarkDir(GlobalRC) == NULL) { RCsetBookmarkDir(GlobalRC,GDnew(32)); ! GDsetTitle(RCgetBookmarkDir(GlobalRC), Gtxt("Bookmarks",67)); } if (CurrentDir == RCgetBookmarkDir(GlobalRC)) { ! CursesErrorMsg(Gtxt("Sorry, can't make a bookmark of bookmarks",151)); break; } *************** *** 1807,1813 **** strcpy(newtitle, GDgetTitle(CurrentDir)); if (CURGetOneOption(CursesScreen, newtitle, ! "Name for this bookmark:", newtitle)==0) { if (*newtitle != '\0') { GSsetTitle(tmpgs, newtitle); --- 1911,1917 ---- strcpy(newtitle, GDgetTitle(CurrentDir)); if (CURGetOneOption(CursesScreen, newtitle, ! Gtxt("Name for this bookmark:",109), newtitle)==0) { if (*newtitle != '\0') { GSsetTitle(tmpgs, newtitle); *************** *** 1847,1858 **** RCsetBookmarkDir(GlobalRC, tempgd); if (tempgd == NULL) { ! Debug("Last item - pip up a directory",NULL) tempgd = CurrentDir; if (popgopher(&CurrentDir)==0 && tempgd != CurrentDir) GDdestroy(tempgd); else { ! CursesErrorMsg("Sorry, can't delete top level directory."); scline(-1, 1, CurrentDir); } ChangedDefs = TRUE; --- 1951,1962 ---- RCsetBookmarkDir(GlobalRC, tempgd); if (tempgd == NULL) { ! Debugmsg("Last item - pip up a directory") tempgd = CurrentDir; if (popgopher(&CurrentDir)==0 && tempgd != CurrentDir) GDdestroy(tempgd); else { ! CursesErrorMsg(Gtxt("Sorry, can't delete top level directory.",149)); scline(-1, 1, CurrentDir); } ChangedDefs = TRUE; *************** *** 1867,1891 **** case '$': case '!': if (SecureMode || NoShellMode) { ! CursesErrorMsg("Sorry, can't spawn in securemode"); break; } /*** Spawn to shell or DCL ***/ CURexit(CursesScreen); #ifdef VMS ! printf("Spawning DCL subprocess. Logout to return to Gopher.\n"); fflush(stdout); i = FIOsystem(""); #else ! printf("Spawning your default shell. Type 'exit' to return to Gopher.\n\n"); fflush(stdout); ! FIOsystem(getenv("SHELL")); #endif CURenter(CursesScreen); ! #ifdef VMS ! if (i != SS$_NORMAL) ! CursesErrorMsg("Spawn to DCL failed!"); #endif break; --- 1971,1996 ---- case '$': case '!': if (SecureMode || NoShellMode) { ! CursesErrorMsg(Gtxt("Sorry, can't spawn in with this account",153)); break; } /*** Spawn to shell or DCL ***/ CURexit(CursesScreen); #ifdef VMS ! printf(Gtxt("Spawning DCL subprocess. Logout to return to Gopher.\n",169)); fflush(stdout); i = FIOsystem(""); #else ! printf(Gtxt("Spawning your default shell. Type 'exit' to return to Gopher.\n\n",170)); fflush(stdout); ! i = FIOsystem(getenv("SHELL")); #endif CURenter(CursesScreen); ! if (i < 0) #ifdef VMS ! CursesErrorMsg(Gtxt("Spawn to DCL failed!",167)); ! #else ! CursesErrorMsg(Gtxt("Spawn to default shell failed!",168)); #endif break; *************** *** 1933,1939 **** break; case '=': ! describe_gopher("Gopher Item Information", GDgetEntry(CurrentDir, GDgetCurrentItem(CurrentDir)-1)); break; --- 2038,2044 ---- break; case '=': ! describe_gopher(Gtxt("Gopher Item Information",93), GDgetEntry(CurrentDir, GDgetCurrentItem(CurrentDir)-1)); break; *************** *** 1940,1949 **** case '^': { if (iLevel == 0) ! describe_gopher("Gopher Directory Information", RootGophers[0]); else ! describe_gopher("Gopher Directory Information", GDgetEntry(OldDirs[iLevel-1], GDgetCurrentItem(OldDirs[iLevel-1])-1)); break; --- 2045,2054 ---- case '^': { if (iLevel == 0) ! describe_gopher(Gtxt("Gopher Directory Information",89), RootGophers[0]); else ! describe_gopher(Gtxt("Gopher Directory Information",89), GDgetEntry(OldDirs[iLevel-1], GDgetCurrentItem(OldDirs[iLevel-1])-1)); break; *************** *** 1955,1964 **** { /*** Display help file ***/ GopherObj *tmpgs; ! tmpgs = GSnew(); GSsetType(tmpgs, A_FILE); ! GSsetTitle(tmpgs, "Gopher Help File"); GSsetLocalFile(tmpgs, GOPHERHELP); GSsetLocalView(tmpgs, "text/plain"); --- 2060,2070 ---- { /*** Display help file ***/ GopherObj *tmpgs; ! tmpgs = GSnew(); GSsetType(tmpgs, A_FILE); ! GSsetTitle(tmpgs, Gtxt("Gopher Help File",92)); ! GSsetLocalFile(tmpgs, GOPHERHELP); GSsetLocalView(tmpgs, "text/plain"); *************** *** 1976,1982 **** char *prompts[2]; char *responses[2]; ! prompts[0]="Host to query:"; prompts[1]=NULL; /*** Offer current gopher host as default ***/ --- 2082,2088 ---- char *prompts[2]; char *responses[2]; ! prompts[0]=Gtxt("Host to query:",98); prompts[1]=NULL; /*** Offer current gopher host as default ***/ *************** *** 1990,2001 **** responses[1] = NULL; if ((CURRequest(CursesScreen, ! "Show host's local date and time", prompts, responses) == -1) || *responses[0] == '\0') break; GSsetType(tempgs, A_FILE); ! GSsetTitle(tempgs, "Local Date and Time"); GSsetHost(tempgs, responses[0]); GSsetPort(tempgs, 13); GSsetPath(tempgs, NULL); --- 2096,2107 ---- responses[1] = NULL; if ((CURRequest(CursesScreen, ! Gtxt("Show host's local date and time",145), prompts, responses) == -1) || *responses[0] == '\0') break; GSsetType(tempgs, A_FILE); ! GSsetTitle(tempgs, Gtxt("Local Date and Time",104)); GSsetHost(tempgs, responses[0]); GSsetPort(tempgs, 13); GSsetPath(tempgs, NULL); *************** *** 2026,2032 **** Load_Index(ZeGopher) GopherObj *ZeGopher; { ! Draw_Status("Searching Text..."); refresh(); return(Load_Index_or_Dir(ZeGopher, Searchstring)); --- 2132,2138 ---- Load_Index(ZeGopher) GopherObj *ZeGopher; { ! Draw_Status(Gtxt("Searching...",143)); refresh(); return(Load_Index_or_Dir(ZeGopher, Searchstring)); *************** *** 2056,2062 **** NewDir = GDnew(32); ! Draw_Status("Connecting..."); refresh(); if ((sockfd = GSconnect(ZeGopher)) <0) { check_sock(sockfd, GSgetHost(ZeGopher), GSgetPort(ZeGopher)); --- 2162,2168 ---- NewDir = GDnew(32); ! Draw_Status(Gtxt("Connecting...",77)); refresh(); if ((sockfd = GSconnect(ZeGopher)) <0) { check_sock(sockfd, GSgetHost(ZeGopher), GSgetPort(ZeGopher)); *************** *** 2064,2074 **** } else { if (GSgetType(ZeGopher) == A_DIRECTORY) { ! Draw_Status("Retrieving Directory..."); refresh(); GStransmit(ZeGopher, sockfd, NULL, "$", NULL); } else if (GSgetType(ZeGopher) == A_INDEX) { ! Draw_Status("Searching..."); refresh(); GStransmit(ZeGopher, sockfd, Searchmungestr, "$", NULL); } --- 2170,2180 ---- } else { if (GSgetType(ZeGopher) == A_DIRECTORY) { ! Draw_Status(Gtxt("Retrieving Directory...",133)); refresh(); GStransmit(ZeGopher, sockfd, NULL, "$", NULL); } else if (GSgetType(ZeGopher) == A_INDEX) { ! Draw_Status(Gtxt("Searching...",143)); refresh(); GStransmit(ZeGopher, sockfd, Searchmungestr, "$", NULL); } *************** *** 2149,2155 **** break; case A_FILE: ! Draw_Status("Receiving Information..."); refresh(); showfile(ZeGopher); break; --- 2255,2261 ---- break; case A_FILE: ! Draw_Status(Gtxt("Receiving Information...",128)); refresh(); showfile(ZeGopher); break; *************** *** 2159,2168 **** if (!RCdisplayCommand(GlobalRC, "Image", "", ImageCmd) || !strncasecmp(ImageCmd, "- none -", 8) || ImageCmd == NULL || ImageCmd == '\0') { ! CursesErrorMsg("Sorry, this machine doesn't support images"); break; } ! Draw_Status("Receiving Image..."); refresh(); if (RemoteUser) Download_file(ZeGopher); --- 2265,2274 ---- if (!RCdisplayCommand(GlobalRC, "Image", "", ImageCmd) || !strncasecmp(ImageCmd, "- none -", 8) || ImageCmd == NULL || ImageCmd == '\0') { ! CursesErrorMsg(Gtxt("Sorry, this machine doesn't support images",158)); break; } ! Draw_Status(Gtxt("Receiving Image...",132)); refresh(); if (RemoteUser) Download_file(ZeGopher); *************** *** 2172,2183 **** case A_MIME: if (!SecureMode) { ! Draw_Status("Receiving MIME File..."); refresh(); showfile(ZeGopher); } else ! CursesErrorMsg("Sorry Cannot display this file anonymously"); break; case A_MACHEX: --- 2278,2289 ---- case A_MIME: if (!SecureMode) { ! Draw_Status(Gtxt("Receiving MIME File...",129)); refresh(); showfile(ZeGopher); } else ! CursesErrorMsg(Gtxt("Sorry, cannot display this file",148)); break; case A_MACHEX: *************** *** 2184,2190 **** case A_PCBIN: case A_UNIXBIN: if (RemoteUser) { ! Draw_Status("Receiving File..."); refresh(); Download_file(ZeGopher); } --- 2290,2296 ---- case A_PCBIN: case A_UNIXBIN: if (RemoteUser) { ! Draw_Status(Gtxt("Receiving File...",126)); refresh(); Download_file(ZeGopher); } *************** *** 2192,2202 **** if (!SecureMode || NoShellMode) Save_file(ZeGopher, NULL, NULL); else ! CursesErrorMsg("Sorry, you are not allowed to save files"); break; case A_DIRECTORY: ! Draw_Status("Receiving Directory..."); refresh(); failed = Load_Dir(ZeGopher); break; --- 2298,2308 ---- if (!SecureMode || NoShellMode) Save_file(ZeGopher, NULL, NULL); else ! CursesErrorMsg(Gtxt("Sorry, you are not allowed to save files",162)); break; case A_DIRECTORY: ! Draw_Status(Gtxt("Receiving Directory...",125)); refresh(); failed = Load_Dir(ZeGopher); break; *************** *** 2203,2209 **** case A_TELNET: case A_TN3270: ! do_tel_3270(ZeGopher); break; case A_INDEX: --- 2309,2334 ---- case A_TELNET: case A_TN3270: ! { ! char type, buf[512]; ! ! if ((type=GSgetType(ZeGopher)) == A_TELNET && ! (!RCdisplayCommand(GlobalRC, "Terminal/telnet", "", buf) || ! !strncasecmp(buf, "- none -", 8) || ! buf == NULL || buf[0] == '\0')) { ! CursesErrorMsg(Gtxt("Sorry, telnet is not available.",157)); ! break; ! } ! else if (type == A_TN3270 && ! (!RCdisplayCommand(GlobalRC, "Terminal/tn3270", "", buf) || ! !strncasecmp(buf, "- none -", 8) || ! buf == NULL || buf[0] == '\0')) { ! CursesErrorMsg(Gtxt("Sorry, tn3270 is not available.",160)); ! break; ! } ! else ! do_tel_3270(ZeGopher); ! } break; case A_INDEX: *************** *** 2214,2220 **** } else Searchstring = do_index(ZeGopher); ! Draw_Status("Searching Text..."); if (Searchstring != NULL) failed=Load_Index(ZeGopher); else --- 2339,2345 ---- } else Searchstring = do_index(ZeGopher); ! Draw_Status(Gtxt("Searching Text...",142)); if (Searchstring != NULL) failed=Load_Index(ZeGopher); else *************** *** 2226,2232 **** break; case A_SOUND: ! Draw_Status("Receiving Sound..."); refresh(); do_sound(ZeGopher); break; --- 2351,2357 ---- break; case A_SOUND: ! Draw_Status(Gtxt("Receiving Sound...",131)); refresh(); do_sound(ZeGopher); break; *************** *** 2235,2244 **** if (!RCdisplayCommand(GlobalRC, "video", "", MovieCmd) || !strncasecmp(MovieCmd, "- none -", 8) || MovieCmd == NULL || MovieCmd == '\0') { ! CursesErrorMsg("Sorry, this machine doesn't support movies"); break; } ! Draw_Status("Receiving Movie..."); refresh(); if (RemoteUser) Download_file(ZeGopher); --- 2360,2369 ---- if (!RCdisplayCommand(GlobalRC, "video", "", MovieCmd) || !strncasecmp(MovieCmd, "- none -", 8) || MovieCmd == NULL || MovieCmd == '\0') { ! CursesErrorMsg(Gtxt("Sorry, this machine doesn't support movies",165)); break; } ! Draw_Status(Gtxt("Receiving Movie...",130)); refresh(); if (RemoteUser) Download_file(ZeGopher); *************** *** 2247,2253 **** break; case A_HTML: ! Draw_Status("Receiving HTML page..."); refresh(); do_html(ZeGopher); break; --- 2372,2378 ---- break; case A_HTML: ! Draw_Status(Gtxt("Receiving HTML page...",127)); refresh(); do_html(ZeGopher); break; *************** *** 2279,2285 **** infogs = GSnew(); GSsetType(infogs, A_FILE); ! GSsetTitle(infogs, "Link Info"); GSgetginfo(ZeGopher, TRUE); --- 2404,2410 ---- infogs = GSnew(); GSsetType(infogs, A_FILE); ! GSsetTitle(infogs, Gtxt("Link Info",103)); GSgetginfo(ZeGopher, TRUE); *************** *** 2292,2298 **** GSsetLocalView(infogs, "text/plain"); if ((tmpfile = fopen(tmpfilename, "w")) == NULL) { CURexit(CursesScreen); ! fprintf(stderr, "Couldn't make a tmp file!\n"), CleanupandExit(-1); } --- 2417,2423 ---- GSsetLocalView(infogs, "text/plain"); if ((tmpfile = fopen(tmpfilename, "w")) == NULL) { CURexit(CursesScreen); ! fprintf(stderr, Gtxt("Couldn't make a tmp file!\n",83)), CleanupandExit(-1); } *************** *** 2324,2331 **** } } ! fprintf(tmpfile, "Size Language Document Type\n"); ! fprintf(tmpfile, "---------- ------------- ----------------------------\n"); for (views=0; views< GSgetNumViews(ZeGopher); views++) { char *cp; --- 2449,2456 ---- } } ! fprintf(tmpfile, Gtxt("Size Language Document Type\n",146)); ! fprintf(tmpfile, Gtxt("---------- ------------- ----------------------------\n",147)); for (views=0; views< GSgetNumViews(ZeGopher); views++) { char *cp; *************** *** 2352,2358 **** fprintf(tmpfile, "%s\n", cp); } ! fprintf(tmpfile, "\n\nServer Information\n"); GSdestroy(server); } --- 2477,2483 ---- fprintf(tmpfile, "%s\n", cp); } ! fprintf(tmpfile, Gtxt("\n\nServer Information\n",186)); GSdestroy(server); } diff -c gopher+/gopher/gopher.h:3.2 gopher+/gopher/gopher.h:3.4 *** gopher+/gopher/gopher.h:3.2 Fri May 27 00:08:48 1994 --- gopher+/gopher/gopher.h Fri May 27 00:08:48 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.2 $ ! * $Date: 1993/09/29 20:52:08 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/gopher.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.4 $ ! * $Date: 1994/05/02 07:40:17 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/gopher.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: gopher.h,v $ + * Revision 3.4 1994/05/02 07:40:17 lindner + * Mods to use setlocale() + * + * Revision 3.3 1994/04/25 03:37:40 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.2 1993/09/29 20:52:08 lindner * remove dead code * *************** *** 34,40 **** /*** All our mongo include files ***/ - #include <stdio.h> /*** Set global configuration options early ***/ --- 40,45 ---- *************** *** 49,54 **** --- 54,60 ---- #include <netdb.h> #include <signal.h> #include "String.h" + #include "Locale.h" #include <ctype.h> #include <errno.h> diff -c gopher+/gopher/gopherrc.c:3.27 gopher+/gopher/gopherrc.c:3.30 *** gopher+/gopher/gopherrc.c:3.27 Fri May 27 00:08:48 1994 --- gopher+/gopher/gopherrc.c Fri May 27 00:08:48 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.27 $ ! * $Date: 1994/04/19 14:31:36 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/gopherrc.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.30 $ ! * $Date: 1994/05/17 05:47:59 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/gopherrc.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: gopherrc.c,v $ + * Revision 3.30 1994/05/17 05:47:59 lindner + * Massive internationalization change + * + * Revision 3.29 1994/05/14 04:13:42 lindner + * Internationalization... + * + * Revision 3.28 1994/05/06 02:28:53 lindner + * Allow getenv code to be used on Unix systems + * * Revision 3.27 1994/04/19 14:31:36 lindner * Fix for the problem of vanishing bookmarks * *************** *** 147,152 **** --- 156,162 ---- #include "fileio.h" #include <stdio.h> + #include "Locale.h" #ifdef VMS #include <unixlib.h> *************** *** 468,474 **** GDfromLink(RCgetBookmarkDir(rc), rcfio, "localhost", 70, "","localhost"); ! GDsetTitle(RCgetBookmarkDir(rc), "Bookmarks"); } else if (strncasecmp(inputline, "searchbolding: ",15)==0) { if (strcasecmp(inputline+15, "yes")==0) RCsetSearchBolding(rc, TRUE); --- 478,484 ---- GDfromLink(RCgetBookmarkDir(rc), rcfio, "localhost", 70, "","localhost"); ! GDsetTitle(RCgetBookmarkDir(rc), Gtxt("Bookmarks",67)); } else if (strncasecmp(inputline, "searchbolding: ",15)==0) { if (strcasecmp(inputline+15, "yes")==0) RCsetSearchBolding(rc, TRUE); *************** *** 503,509 **** RCfromENV(rc) RCobj *rc; { - #ifdef VMS char tmpstr[512], Printer[128], PrinterP[128], Pager[128], PagerP[128]; boolean PrinterFlag = FALSE; --- 513,518 ---- *************** *** 577,585 **** sprintf(tmpstr, "text/html,%s,", getenv("GOPHER_HTML")); RCMAfromLine(rc->commands, tmpstr); } - #else - ; - #endif } --- 586,591 ---- *************** *** 608,621 **** about a file they cant get at! */ rcfile = rcopen(O_CREAT); FIOclose(rcfile); ! printf("Welcome to the wonderful world of Gopher!\n\n"); ! printf("Gopher has limitations on its use and comes without\n"); ! printf("a warranty. Please refer to the file 'Copyright' included\n"); ! printf("in the distribution.\n\n"); ! printf("Internet Gopher Information Client %s.%s patch%d\n", GOPHER_MAJOR_VERSION, GOPHER_MINOR_VERSION, PATCHLEVEL); ! printf("Copyright 1991,92,93,94 by the Regents of the University of Minnesota\n\n"); ! printf("Press RETURN to continue\n"); while ('\n' != getchar()) ; } /*NoShellMode*/ --- 614,627 ---- about a file they cant get at! */ rcfile = rcopen(O_CREAT); FIOclose(rcfile); ! printf(Gtxt("Welcome to the wonderful world of Gopher!\n\n",1)); ! printf(Gtxt("Gopher has limitations on its use and comes without\n",2)); ! printf(Gtxt("a warranty. Please refer to the file 'Copyright' included\n",3)); ! printf(Gtxt("in the distribution.\n\n",4)); ! printf(Gtxt("Internet Gopher Information Client %s.%s patch%d\n",6), GOPHER_MAJOR_VERSION, GOPHER_MINOR_VERSION, PATCHLEVEL); ! printf(Gtxt("Copyright 1991,92,93,94 by the Regents of the University of Minnesota\n\n",5)); ! printf(Gtxt("Press RETURN to continue\n",7)); while ('\n' != getchar()) ; } /*NoShellMode*/ *************** *** 726,734 **** if (rcfile ==NULL) { #ifdef VMS ! fprintf(stderr,"Can't write gopher configuration file!!"); #else ! CursesErrorMsg("Can't write gopher configuration file!!"); #endif return; } --- 732,740 ---- if (rcfile ==NULL) { #ifdef VMS ! fprintf(stderr,Gtxt("Can't write gopher configuration file!!",8)); #else ! CursesErrorMsg(Gtxt("Can't write gopher configuration file!!",8)); #endif return; } diff -c gopher+/gopher/html2.c:3.12 gopher+/gopher/html2.c:3.15 *** gopher+/gopher/html2.c:3.12 Fri May 27 00:08:49 1994 --- gopher+/gopher/html2.c Fri May 27 00:08:49 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.12 $ ! * $Date: 1994/04/14 02:56:55 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/html2.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.15 $ ! * $Date: 1994/05/17 05:48:00 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/html2.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: html2.c,v $ + * Revision 3.15 1994/05/17 05:48:00 lindner + * Massive internationalization change + * + * Revision 3.14 1994/05/14 04:13:43 lindner + * Internationalization... + * + * Revision 3.13 1994/04/25 20:47:34 lindner + * Remove html stuff from menu + * * Revision 3.12 1994/04/14 02:56:55 lindner * Replace yet another system call * *************** *** 66,424 **** #include "gopher.h" #include "Malloc.h" - #include "HTML.h" #include "Debug.h" - Ourpager(){ ;} - char *process_tag(); static char *parastorage = NULL; static int parasize=0; static int paraptr=0; - static int HeadingLevel=1; - static int Linknum =0; - - /*** State information for the HTML parser, ick ***/ - - boolean inANCHOR = FALSE; - boolean inXMP = FALSE; - boolean inLISTING = FALSE; - boolean inADDRESS = FALSE; - boolean inDL = FALSE; - boolean inDT = FALSE; - boolean inMENU = FALSE; - boolean inPLAINTXT= FALSE; - boolean inLIST = FALSE; - boolean inPAREN = FALSE; - boolean inH1 = FALSE; - boolean inHeading = FALSE; - boolean isIndex = FALSE; - - /*** Different Types of justification ***/ - #define JUSTIFY_LEFT 1 - #define JUSTIFY_CENTER 2 - #define JUSTIFY_RIGHT 3 - - /*** Different types of text styles ***/ - #define STYLE_NL 1 /** Normal **/ - #define STYLE_UL 2 /** Underline **/ - - /** Link delimiters **/ - #define START_LINK '\177' - #define END_LINK '\013' - - int CurrentLine = 0; - int CurrentLinepos = 0; - extern int COLS; - - HTMLObj *CurrentHTML; - int anchoroffset = -1; - - int HTMLfilenum =0; - /* - * Add a character to the paragraph buffer - */ - - static buffer_ch(ch) - char ch; - { - /** check for overflow **/ - if (inANCHOR==FALSE) - anchoroffset = -1; - - if ((inANCHOR == TRUE) && (anchoroffset == -1)) - anchoroffset = paraptr; - - if (paraptr == parasize-1) { - char *temp; - - parasize *=2; - temp = (char*) realloc(parastorage, parasize); - - if (temp != parastorage) - parastorage = temp; - } - - *(parastorage + paraptr++) = ch; - *(parastorage + paraptr) = '\0'; - } - - - /* - * addch outputs a character to the file - * It also notes the location of links in the file - */ - - static add_ch(ch, zefile) - char ch; - FILE *zefile; - { - if (ch == '\t') { - fprintf(zefile, " "); - CurrentLinepos += 8; - } - else if (ch == '\n') { - CurrentLine++; - CurrentLinepos = 0; - fputc('\n', zefile); - } - else if (ch == START_LINK) { - HTMLSetLinepos(CurrentHTML, Linknum, CurrentLinepos+1); - HTMLSetLinenum(CurrentHTML, Linknum, CurrentLine); - Linknum++; - - CurrentLinepos++; - fputc('[', zefile); - } - else if (ch == END_LINK) { - CurrentLinepos++; - fputc(']', zefile); - } - else { - CurrentLinepos++; - fputc(ch, zefile); - } - } - - /* - * This is the same as add_ch, except it underlines - */ - - static addul_ch(ch, zefile) - char ch; - FILE *zefile; - { - fputc('_', zefile); - fputc('\b', zefile); - add_ch(ch, zefile); - } - - /* - * Add a string to the file using add_ch - */ - - static add_string(cp, zefile) - FILE *zefile; - char *cp; - { - - while (*cp != '\0') - add_ch(*cp++, zefile); - } - - /* - * Add an underlined string - */ - - static addul_string(cp, zefile) - FILE *zefile; - char *cp; - { - - while (*cp != '\0') - addul_ch(*cp++, zefile); - } - - /* - * Flush the paragraph buffer - */ - flush_null(zefile) - FILE *zefile; - { - paraptr = 0; - } - - /* - * Output the buffer as is - */ - - flush_raw(zefile) - FILE *zefile; - { - if (paraptr == 0) - return; - - *(parastorage +paraptr) = '\0'; - - if (inXMP == TRUE || inLISTING==TRUE) { - add_string(parastorage, zefile); - paraptr = 0; - return; - } - - add_ch('\n', zefile); - - } - - - char * - strip_crap_begin(cp) - char *cp; - { - while (*cp == ' ' || *cp == '\n') { - cp++; - } - return(cp); - } - - - - - - /* - * Add a generalized paragraph. Does word wrapping, justification, - * leading space, total indentation level, bullets, and underlining - */ - static flush_it(zefile, leading, indent, bullet, justify, style) - FILE *zefile; - int leading; - int indent; - char *bullet; - int justify; - int style; - { - char *lastspace = NULL; - register char *cp; - char *beginline = parastorage; - int i; - int testlinepos=0; - - while (CurrentLinepos < indent) { - add_ch(' ', zefile); - } - - /** Add leading space **/ - while (leading-- != 0) - add_ch(' ', zefile); - - /** Add bullet space **/ - if (bullet != NULL) - add_string(bullet, zefile); - - testlinepos = CurrentLinepos; - cp = beginline = strip_crap_begin(parastorage); - - for (; cp < parastorage+paraptr; cp++, testlinepos++) { - - if (*cp == '\n') - *cp = ' '; - if (*cp == ' ') - lastspace = cp; - - if (testlinepos == COLS-1) { - if (lastspace == NULL) { /** Big long line, chop it. **/ - char tempch = *cp; - - *cp = '\0'; - if (style == STYLE_UL) - addul_string(beginline, zefile); - else - add_string(beginline, zefile); - add_ch('\n', zefile); - *cp = tempch; - cp = strip_crap_begin(cp); - beginline = cp; - } else { - *lastspace = '\0'; - - /** Justify here **/ - if (justify == JUSTIFY_RIGHT) { - for (i=CurrentLinepos; i<(COLS -(lastspace-beginline)); i++) - add_ch(' ', zefile); - } - if (style == STYLE_UL) - addul_string(beginline, zefile); - else - add_string(beginline, zefile); - - add_ch('\n', zefile); - cp = strip_crap_begin(lastspace+1); - beginline = cp; - } - - lastspace = NULL; - - while (CurrentLinepos < indent) { - add_ch(' ', zefile); - } - - if (bullet != NULL) { - for (i=0; i <strlen(bullet); i++) - add_ch(' ', zefile); - } - - testlinepos = CurrentLinepos; - } - } - if (justify == JUSTIFY_RIGHT) { - while (CurrentLinepos < (COLS-strlen(beginline)-1)) - add_ch(' ', zefile); - } else if (justify == JUSTIFY_CENTER) { - while (CurrentLinepos < ((COLS-strlen(beginline)-1)/2)) - add_ch(' ', zefile); - } - if (style == STYLE_UL) - addul_string(beginline, zefile); - else - add_string(beginline, zefile); - - if (inDT == FALSE) { - add_ch('\n', zefile); - if (inADDRESS == FALSE) - add_ch('\n', zefile); - } - - paraptr = 0; - } - - /* - * Output the paragraph take note of our state and add different styles. - */ - - static flush_paragraph(zefile) - FILE *zefile; - { - char *cp; - - if (paraptr == 0) - return; - - /*** If it's a bunch of '\n''s skip it... ***/ - for (cp = parastorage; (*cp == '\n'); cp++) - ; - if (*cp == '\0') - return; - - if (inADDRESS==TRUE) - flush_it(zefile, 0, HeadingLevel*3, NULL, JUSTIFY_RIGHT, STYLE_NL); - else if (inDL==TRUE) { - if (inDT) - flush_it(zefile, 0, HeadingLevel*3, NULL, JUSTIFY_LEFT, STYLE_UL); - else - flush_it(zefile, 1, (HeadingLevel+1)*3, NULL, JUSTIFY_LEFT, STYLE_NL); - } - else if (inLIST==TRUE) { - flush_it(zefile, 0, HeadingLevel*3, "* ", JUSTIFY_LEFT,STYLE_NL); - } - else if (inH1 == TRUE) - flush_it(zefile, 0, 0, NULL, JUSTIFY_CENTER, STYLE_UL); - else if (inHeading == TRUE) - flush_it(zefile, 0, (HeadingLevel-1)*3, NULL, JUSTIFY_LEFT, STYLE_UL); - else { - flush_it(zefile, 3, HeadingLevel*3, NULL, JUSTIFY_LEFT, STYLE_NL); - } - } - - HTMLfromNet(html, sockfd) - HTMLObj *html; - int sockfd; - { - ; - } - - /* * Enable use of an external HTML browser until the * builtin HTML pager is functional (if ever 8-). */ --- 75,88 ---- *************** *** 435,441 **** if (!RCdisplayCommand(GlobalRC, "text/html", "", HTMLcmd) || !strncasecmp(HTMLcmd, "- none -", 8) || HTMLcmd == NULL || HTMLcmd[0] == '\0') { ! CursesErrorMsg("Sorry, this client does not support HTML"); return; } else --- 99,105 ---- if (!RCdisplayCommand(GlobalRC, "text/html", "", HTMLcmd) || !strncasecmp(HTMLcmd, "- none -", 8) || HTMLcmd == NULL || HTMLcmd[0] == '\0') { ! CursesErrorMsg(Gtxt("Sorry, this client does not support HTML",47)); return; } else *************** *** 448,459 **** #ifdef VMS refresh(); #endif ! Dialogmess[0] = "Warning!!!!!, you are about to leave the Internet Gopher"; ! Dialogmess[1] = "Client and connect to an HTML Browser. Use the Browser"; ! Dialogmess[2] = "Help if you are not familiar with its commands."; Dialogmess[3] = ""; ! Dialogmess[4] = "Upon quitting from the Browser, you will be returned to"; ! Dialogmess[5] = "the Internet Gopher Client."; Dialogmess[6] = NULL; if (CURDialog(CursesScreen, GSgetTitle(ZeGopher), Dialogmess) <0) --- 112,123 ---- #ifdef VMS refresh(); #endif ! Dialogmess[0] = Gtxt("Warning!!!!!, you are about to leave the Internet Gopher",42); ! Dialogmess[1] = Gtxt("Client and connect to an HTML Browser. Use the Browser",43); ! Dialogmess[2] = Gtxt("Help if you are not familiar with its commands.",44); Dialogmess[3] = ""; ! Dialogmess[4] = Gtxt("Upon quitting from the Browser, you will be returned to",45); ! Dialogmess[5] = Gtxt("the Internet Gopher Client.",46); Dialogmess[6] = NULL; if (CURDialog(CursesScreen, GSgetTitle(ZeGopher), Dialogmess) <0) *************** *** 463,733 **** FIOsystem(command); CURenter(CursesScreen); - } - #ifdef NOTDEFINED /* Builtin HTML pager doesn't work */ - do_html(ZeGopher) - GopherObj *ZeGopher; - { - FILE *tmpfile; - char tmpfilename[256]; - char inputline[512]; - char outputline[512]; - char *cp; - int sockfd, iLength; - - DebugGSplusPrint(ZeGopher,"do_html start"); - if (parastorage == NULL) { - parasize = 4096; - paraptr = 0; - parastorage = (char *) malloc(parasize); - bzero(parastorage, 4096); - } - - CurrentHTML = HTMLnew(32); - - if ((sockfd = GSconnect(ZeGopher)) <0) { - check_sock(sockfd, GSgetHost(ZeGopher), GSgetPort(ZeGopher)); - return; - } - - /** Send out the request **/ - - writestring(sockfd, GSgetPath(ZeGopher)); - writestring(sockfd, "\r\n"); - - /** Open a temporary file **/ - - sprintf(tmpfilename, "/tmp/gopherhtml.%d.%d",getpid(),HTMLfilenum++); - - if ((tmpfile = fopen(tmpfilename, "w")) == NULL) - fprintf(stderr, "Couldn't make a tmp file!\n"), exit(-1); - - for(;;) { - - iLength = readline(sockfd, inputline, 512); - outputline[0] = '\0'; - if (iLength == 0) - break; - - ZapCRLF(inputline); - - for (cp=inputline; *cp != '\0'; cp++) { - - if (*cp == '<') { /** Start of tag? **/ - - cp = process_tag(cp, tmpfile); - } - else - buffer_ch(*cp); - } - buffer_ch('\n'); - } - - flush_paragraph(tmpfile); - - if (isIndex) - ;/* add_index_entry(zefile);*/ - - (void)fclose(tmpfile); - - - /* display_file(tmpfilename, GSgetTitle(ZeGopher));*/ - - CURexit(CursesScreen); - - HTML_pager(tmpfilename, CurrentHTML); - - /** Good little clients clean up after themselves..**/ - - if (unlink(tmpfilename)!=0) - fprintf(stderr, "Couldn't unlink!!!\n"), exit(-1); - - CURenter(CursesScreen); - } - #endif /* NOTDEFINED */ - - - - char * - process_tag(cp, tmpfile) - char *cp; - FILE *tmpfile; - { - char *cp2; - char *endtag; - static GopherObj *Anchorgs=NULL; - - - for (cp2 = cp+1; - *cp2 != '>' && *cp2 != '<' && *cp2 != '\0'; - cp2++) - if (*cp2 == ' ') - endtag = cp2; - - if (endtag==NULL) endtag=cp2; - - if (*cp2 != '>') /** Not a tag **/ - return(cp); - - /** It's a tag.. */ - - - /*** Check for these cases first, they're weird ***/ - - if (inXMP == TRUE) { - if (strncasecmp(cp, "</XMP",5)==0) { - flush_raw(tmpfile); - inXMP = FALSE; - return(cp2); - } - inPAREN = TRUE; - buffer_ch(*cp); - return(cp); - } - else if (inLISTING == TRUE) { - if (strncasecmp(cp, "</LISTING",5)==0) { - flush_raw(tmpfile); - inLISTING = FALSE; - return(cp2); - } - inPAREN = TRUE; - buffer_ch(*cp); - return(cp); - } - - - - /** Check for tags that are embedded in paragraphs **/ - if (strncasecmp(cp, "<A ", 3)==0) { - char *href; - - href = strstr(cp, "HREF="); - if (href == NULL) - return(cp2); - - href += 5; - if (Anchorgs == NULL) - Anchorgs = GSnew(); - else - GSinit(Anchorgs); - - *cp2 = '\0'; - GSfromURL(Anchorgs, href, NULL, 0); - - /** An anchor link **/ - buffer_ch(START_LINK); - - inANCHOR = TRUE; - return(cp2); - - } - else if (strncasecmp(cp, "</A>", 4)==0) { - if (inANCHOR == TRUE) { - GSsetTitle(Anchorgs, parastorage+anchoroffset); /** Ick **/ - buffer_ch(END_LINK); - buffer_ch(' '); - inANCHOR = FALSE; - } - HTMLaddLink(CurrentHTML, Anchorgs, 42,42); - - return(cp2); - } - - /** Okay, anything else ends a paragraph, if we're in it... **/ - - if (inPAREN == TRUE) { - flush_paragraph(tmpfile); - inPAREN = FALSE; - } - - /*** Assume that we're in a paragraph ***/ - inPAREN = TRUE; - - /** Any other tag is the start of something new **/ - - if (strncasecmp(cp, "<P", 2)==0) { - inPAREN = TRUE; - } - - else if (strncasecmp(cp, "<ADDRESS", 8)==0) { - inADDRESS =TRUE; - add_ch('\n', tmpfile); - } - - else if (strncasecmp(cp, "</ADDRESS",9)==0) { - inADDRESS = FALSE; - } - - else if (strncasecmp(cp, "<TITLE",6)==0) { - inPAREN = FALSE; - } - else if (strncasecmp(cp, "</TITLE",7)==0) { - flush_null(tmpfile); - } - else if (strncasecmp(cp, "<H1", 3) ==0) { - inH1 = TRUE; - } - else if (strncasecmp(cp, "<H",2) ==0) { - HeadingLevel = *(cp+2) - '0' - 1; - inHeading = TRUE; - } - else if (strncasecmp(cp, "</H1", 4) ==0) { - inH1=FALSE; - } - else if (strncasecmp(cp, "</H", 3) ==0) { - inHeading = FALSE; - } - else if (strncasecmp(cp, "<XMP", 4)==0) { - add_ch('\n',tmpfile); - inXMP = TRUE; - inPAREN = FALSE; - } - else if (strncasecmp(cp, "<LISTING",7)==0) { - add_ch('\n',tmpfile); - inLISTING = TRUE; - inPAREN = FALSE; - } - else if (strncasecmp(cp, "<DL",3)==0) { - inDL = TRUE; - inPAREN = FALSE; - } - else if (strncasecmp(cp, "<DD", 3)==0) { - inPAREN = TRUE; - inDT = FALSE; - - /*flush_term(tmpfile);*/ - } - - else if (strncasecmp(cp, "<DT", 3)==0) { - inDT = TRUE; - } - - else if ( strncasecmp(cp, "</DL",4)==0) { - inDL = FALSE; - } - - else if (strncasecmp(cp, "<UL",3)==0) { - inLIST = TRUE; - } - else if (strncasecmp(cp, "<MENU",5)==0) { - inMENU =TRUE; - } - else if (strncasecmp(cp, "</MENU",6)==0) { - inMENU=FALSE; - } - else if (strncasecmp(cp, "<LI", 3)==0) { - ; - } - else if (strncasecmp(cp, "</UL", 4)==0) { - inLIST = FALSE; - } - - else if (strncasecmp(cp, "</ISINDEX", 9)==0) { - isIndex = TRUE; - } - - else if (strncasecmp(cp, "<PLAINTEXT", 10)==0) { - inPLAINTXT = TRUE; - } - return(cp2); } --- 127,130 ---- diff -c gopher+/gopher/hymoo.c:3.5 gopher+/gopher/hymoo.c:removed *** gopher+/gopher/hymoo.c:3.5 Fri May 27 00:08:49 1994 --- gopher+/gopher/hymoo.c Fri May 27 00:08:49 1994 *************** *** 1,429 **** - /******************************************************************** - * $Author: lindner $ - * $Revision: 3.5 $ - * $Date: 1993/08/19 20:22:51 $ - * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/Attic/hymoo.c,v $ - * $State: Exp $ - * - * Paul Lindner, University of Minnesota CIS. - * - * Copyright 1991, 1992 by the Regents of the University of Minnesota - * see the file "Copyright" in the distribution for conditions of use. - ********************************************************************* - * MODULE: hymoo.c - * More stuff to do html. - ********************************************************************* - * Revision History: - * $Log: hymoo.c,v $ - * Revision 3.5 1993/08/19 20:22:51 lindner - * Mitra's Debug patch - * - * Revision 3.4 1993/08/16 18:49:17 lindner - * Alpha and DECC mods - * - * Revision 3.3 1993/07/29 17:21:22 lindner - * eliminate non-used variables - * - * Revision 3.2 1993/07/27 05:28:54 lindner - * Mondo Debug overhaul from Mitra - * - * Revision 3.1.1.1 1993/02/11 18:03:00 lindner - * Gopher+1.2beta release - * - * Revision 2.1 1993/02/09 22:36:38 lindner - * Fixes for new rc stuff - * - * Revision 1.1 1992/12/10 23:32:16 lindner - * gopher 1.1 release - * - * Revision 1.1 1992/12/10 06:16:51 lindner - * Initial revision - * - * - *********************************************************************/ - - #include <stdio.h> - #include <ctype.h> - #include <signal.h> - #include "String.h" - #include "CURcurses.h" - #include "HTML.h" - #include "gopherrc.h" - #include "globals.h" - #include "Debug.h" - - #define HELP "Commands: Use arrow keys to move, '?' for help, 'q' to quit" - #define MOREHELP \ - "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit" - #define MORE "-- press space for more --" - - #define STREQ(a,b) (strcmp(a,b) == 0) - #define STRNEQ(a,b,c) (strncmp(a,b,c) == 0) - #define printable(c) (((c)>31 && (c)<=127) || (c)==9 || (c)==10) - - - boolean more = FALSE; - char *interaddr(), *nextword(), *pop(), *mystrncpy(); - - #ifdef VMS - # define strncasecmp strncmp /* vms doesn't have strncasecmp */ - #endif - - cleanup() - { - int lastx=1, lasty=1; - - move(LINES-1, 0); - mvcur(lasty, lastx, LINES-1, 0); - clrtoeol(); - refresh(); - - CURexit(CursesScreen); - } - - /* - * Returns the page number of a given line number - */ - - int - Pagenum(linenum) - int linenum; - { - return(linenum/LINES); - } - - /* - * here's where we do all the work - */ - - void - HTML_pager(filename, html) - char *filename; - HTMLObj *html; - { - int ch; - FILE *fp; - int OldPage=1, CurrentPage=1; - int Currentlink = 0; - - CURenter(CursesScreen); - - if ((fp=fopen(filename, "r")) != NULL) { - /*** Show the first page ***/ - showpage(fp, 1, 0, html); - if (HTMLGetNumLinks(html) != 0) - highlight(TRUE, Currentlink, CurrentPage, html); - } else { - return; - } - - while (TRUE) { - if (CurrentPage != OldPage) { - showpage(fp, CurrentPage, OldPage, html); - OldPage = CurrentPage; - } - - ch = CURgetch(CursesScreen); - switch (ch) { - - case '\n': /* Traverse the link */ - do_html(HTMLGetLink(html, Currentlink)); - break; - - case 'u': /** Exit from this page **/ - case 'h': - case KEY_LEFT: - CURexit(CursesScreen); - return; - break; - - case '\t': /* Next Link */ - if (Currentlink == HTMLGetNumLinks(html) || HTMLGetNumLinks(html)==0) { - Debug("CURBeep HTML_Pager\r\n",NULL) - CURBeep(CursesScreen); - break; - } - - OldPage = CurrentPage; - - /*** Move down, if necessary ***/ - - while (Pagenum(HTMLGetLinenum(html, Currentlink+1)) != CurrentPage) { - CurrentPage++; - } - - - highlight(FALSE, Currentlink++, CurrentPage, html); - highlight(TRUE, Currentlink, CurrentPage, html); - - break; - - case ' ': /* Next screenful */ - case KEY_NPAGE: - - OldPage = CurrentPage; - CurrentPage++; - break; - - case KEY_PPAGE: - case 'b': - OldPage = CurrentPage; - CurrentPage--; - break; - } - } - } - - HTMLMoo_pager(filename, html) - char *filename; - HTMLObj *html; - { - int c, arrowup=FALSE, show_help=FALSE; - int cur = 0, savcur = 0; - int oldpage = 0, newpage = 1; - FILE *fp = NULL; - - - - while (TRUE) { - if (oldpage != newpage) { - if (showpage(fp, newpage, oldpage, html) > 0) { - if (arrowup) { - cur = HTMLGetLinkMax(html) - 1; - arrowup = FALSE; - } else - cur = savcur; - savcur = 0; - oldpage = newpage; - } else { - newpage = oldpage; - } - } - - if (!show_help) { - if (more) - statusline(MORE); - else - statusline((char *) NULL); - } - - - c=CURgetch(CursesScreen); - - highlight(TRUE, cur, newpage, html); /* highlight current link */ - - if (show_help) { - if (more) - statusline(MORE); - else - statusline((char *) NULL); - show_help = FALSE; - } - - switch(c) { - case 'q': /* quit */ - case 'Q': - case 4: - cleanup(); - return; - case ' ': /* next page */ - case '+': - newpage++; - break; - case 'b': /* prev page */ - case '-': - newpage--; - break; - case KEY_UP: - case 'k': - if (cur>0) { /* previous link */ - highlight(FALSE, cur, newpage, html); - cur--; - } else if (oldpage > 1) { /* previous page */ - newpage--; - arrowup = TRUE; - } - break; - case KEY_DOWN: - case 'j': - if (HTMLGetLinenum(html, cur+1) < (newpage+1)*LINES) { - highlight(FALSE, cur, newpage, html); /** Next link **/ - cur++; - } else { /* next page */ - newpage++; - } - break; - case KEY_LEFT: /* back up a level */ - case 'h': /* i.e. quit */ - cleanup(); - return; - break; - case KEY_RIGHT: /* follow a link */ - case 'l': - case '\n': - case '\r': - if (HTMLGetLinkMax(html) > 0) { - /** Traverse link here **/ - - statusline((char *) NULL); - } - break; - default: - if (more) - statusline(MOREHELP); - else - statusline(HELP); - show_help = TRUE; - #ifdef DEBUGGING - printw("%d", c); - #endif - break; - } - } - } - - - /* - * display one screen of text - * - * Read & display one screenfull of text. - * - * Pre-reads one line from the next page, to ensure that the "- more -" - * message is only displayed when there really is more. - */ - int - showpage(fp, page, oldpage, html) - FILE *fp; - int page, oldpage; - HTMLObj *html; - { - int col, lineno; - static char line[512]; - char *cp; - - if (page < 1) - page = 1; - - if (page == oldpage) { /* nothing to do */ - return(0); - } else if (page < oldpage) { /* have to back up */ - rewind(fp); - oldpage = 0; - } - - if (page == 1 || page != oldpage+1) { - more = FALSE; - lineno = oldpage*(LINES-1); - while (lineno<(page-1)*(LINES-1) && fgets(line, COLS, fp) != NULL) { - lineno++; - } - } - - lineno = 0; - clear(); - #ifdef VMS - refresh(); - #endif - - while (lineno<(LINES-1) && (more || fgets(line, 512, fp) != NULL)) { - more = FALSE; - - ZapCRLF(line); - - for (cp = line; *cp != '\0'; cp++) { - if ((*cp == '_') && (*(cp +1) == '\b')) { - cp +=2; - #ifdef A_BOLD - addch(A_BOLD | *cp); - #else - addch(*cp); - #endif - } else - addch(*cp); - } - addch('\n'); - lineno++; - } - - if (lineno==(LINES-1) && fgets(line,512, fp) != NULL) - more = TRUE; - standout(); - addstr("<Space> for next page"); - standend(); - - refresh(); - return(lineno); - } - - - /* - * Return pointer to the second word in a string - */ - char * - nextword(cp) - char *cp; - { - while (*cp != ' ' && *cp != '\0') cp++; /* skip non-spaces */ - while (*cp == ' ') cp++; /* skip spaces */ - return(cp); - } - - - /* - * my strncpy() terminates strings with a null byte. - * Writes a null byte into the n+1 byte of dst. - */ - char * - mystrncpy(dst, src, n) - char *dst, *src; - int n; - { - char *val; - - val = strncpy(dst, src, n); - *(dst+n) = '\0'; - return val; - } - - - - - /* - * highlight (or unhighlight) a given link - */ - highlight(flag, cur, curpage, html) - boolean flag; - int cur; - int curpage; - HTMLObj *html; - { - /*** Assume that the link is on this page **/ - - if (HTMLGetLinkMax(html) > 0) { - move(HTMLGetLinenum(html, cur) - (curpage-1) * LINES, - HTMLGetLinepos(html, cur)); - if (flag) standout(); - addstr(GSgetTitle(HTMLGetLink(html, cur))); - if (flag) standend(); - refresh(); - } - } - - - /* - * display (or hide) the status line - */ - statusline(text) - char *text; - { - move(LINES-1,0); - clrtoeol(); - if (text != NULL) { - standout(); - addstr(text); - standend(); - } - refresh(); - } - - --- 0 ---- diff -c gopher+/gopher/link.com:3.7 gopher+/gopher/link.com:3.8 *** gopher+/gopher/link.com:3.7 Fri May 27 00:08:49 1994 --- gopher+/gopher/link.com Fri May 27 00:08:50 1994 *************** *** 1,8 **** $ vg = 'f$verify(0)' $!******************************************************************** $! $Author: lindner $ ! $! $Revision: 3.7 $ ! $! $Date: 1994/02/20 16:17:40 $ $! $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/link.com,v $ $! $State: Exp $ $! --- 1,8 ---- $ vg = 'f$verify(0)' $!******************************************************************** $! $Author: lindner $ ! $! $Revision: 3.8 $ ! $! $Date: 1994/05/06 02:21:31 $ $! $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/link.com,v $ $! $State: Exp $ $! *************** *** 16,21 **** --- 16,24 ---- $!********************************************************************* $! Revision History: $! $Log: link.com,v $ + $! Revision 3.8 1994/05/06 02:21:31 lindner + $! Mods for TCPWARE on VMS + $! $! Revision 3.7 1994/02/20 16:17:40 lindner $! Add form object file $! *************** *** 55,60 **** --- 58,64 ---- @link MULTINET @link CMUIP @link NETLIB + @link TCPWARE $ exit $ ENDIF $! *************** *** 61,71 **** $ ON CONTROL_Y THEN GOTO CLEANUP $ ON ERROR THEN GOTO CLEANUP $! $ IF f$trnlnm("VAXCMSG") .eqs. "DECC$MSG" $ THEN ! $ optfile := "''P1'_DECC" ! DECC/Alpha $ ELSE ! $ optfile := "''P1'_VAXC" ! VAXC $ ENDIF $! $ vgl = f$verify(1) --- 65,83 ---- $ ON CONTROL_Y THEN GOTO CLEANUP $ ON ERROR THEN GOTO CLEANUP $! + $ IF P1 .eqs. "TCPWARE" + $ THEN + $ write sys$output "Linking client with UCX emulation..." + $ transport := "UCX" + $ ELSE + $ transport := "''P1'" + $ ENDIF + $! $ IF f$trnlnm("VAXCMSG") .eqs. "DECC$MSG" $ THEN ! $ optfile := "''transport'_DECC" ! DECC/Alpha $ ELSE ! $ optfile := "''transport'_VAXC" ! VAXC $ ENDIF $! $ vgl = f$verify(1) diff -c gopher+/gopher/manager.c:3.21 gopher+/gopher/manager.c:3.24 *** gopher+/gopher/manager.c:3.21 Fri May 27 00:08:50 1994 --- gopher+/gopher/manager.c Fri May 27 00:08:50 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.21 $ ! * $Date: 1994/03/31 21:26:15 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/manager.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.24 $ ! * $Date: 1994/05/17 05:48:01 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/manager.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: manager.c,v $ + * Revision 3.24 1994/05/17 05:48:01 lindner + * Massive internationalization change + * + * Revision 3.23 1994/05/14 04:13:45 lindner + * Internationalization... + * + * Revision 3.22 1994/04/25 03:37:42 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.21 1994/03/31 21:26:15 lindner * Make DEBUG toggleable * *************** *** 123,129 **** { char line[80]; ! sprintf(line, "Internet Gopher Information Client v%s.%s.%d", GOPHER_MAJOR_VERSION, GOPHER_MINOR_VERSION, PATCHLEVEL); CURcenterline(CursesScreen, stdscr, line, 0, COLS, TRUE); } --- 132,139 ---- { char line[80]; ! sprintf(line, Gtxt("Internet Gopher Information Client v%s.%s.%d",102), ! GOPHER_MAJOR_VERSION, GOPHER_MINOR_VERSION, PATCHLEVEL); CURcenterline(CursesScreen, stdscr, line, 0, COLS, TRUE); } *************** *** 136,152 **** Draw_Status(textline) char *textline; { ! mvaddstr(LINES-1, 0, "Press "); standout(); addstr("?"); standend(); ! addstr(" for Help, "); standout(); addstr("q"); standend(); ! addstr(" to Quit"); #ifndef AUTOEXITONU if (iLevel != 0) { --- 146,162 ---- Draw_Status(textline) char *textline; { ! mvaddstr(LINES-1, 0, Gtxt("Press ",119)); standout(); addstr("?"); standend(); ! addstr(Gtxt(" for Help, ",57)); standout(); addstr("q"); standend(); ! addstr(Gtxt(" to Quit",58)); #ifndef AUTOEXITONU if (iLevel != 0) { *************** *** 154,160 **** standout(); addstr("u"); standend(); ! addstr(" to go up a menu"); } #endif clrtoeol(); --- 164,170 ---- standout(); addstr("u"); standend(); ! addstr(Gtxt(" to go up a menu",59)); } #endif clrtoeol(); *************** *** 391,397 **** } ! sprintf(sPagenum, " Page: %d/%d", nNewPage, nMaxPages); Draw_Status(sPagenum); mvaddstr(MENULINE(iOldLine), 1, " "); mvaddstr(MENULINE(iNewLine), 1, "-->"); --- 401,407 ---- } ! sprintf(sPagenum, Gtxt(" Page: %d/%d",56), nNewPage, nMaxPages); Draw_Status(sPagenum); mvaddstr(MENULINE(iOldLine), 1, " "); mvaddstr(MENULINE(iNewLine), 1, "-->"); *************** *** 506,512 **** sLinenum[0] = (char) ch; sLinenum[1] = '\0'; ! if (CUROldGetOneOption(CursesScreen, "View item number: ", sLinenum) <0) { scline(iItem, iNewItem, gd); break; } --- 516,524 ---- sLinenum[0] = (char) ch; sLinenum[1] = '\0'; ! if (CUROldGetOneOption(CursesScreen, ! Gtxt("View item number: ",179), ! sLinenum) <0) { scline(iItem, iNewItem, gd); break; } *************** *** 514,520 **** if (atoi(sLinenum) <= numitems) iNewItem = atoi(sLinenum); /* Jump */ else { - Debug("GetMenu beepo digit\r\n",NULL) CURBeep(CursesScreen); break; } --- 526,531 ---- *************** *** 535,541 **** sfound = 0; if (search1[0] == '\0' && ch == 'n') { ! CursesErrorMsg("Use '/' to define a search first..."); iItem = scline(-1,iItem, gd); break; } --- 546,552 ---- sfound = 0; if (search1[0] == '\0' && ch == 'n') { ! CursesErrorMsg(Gtxt("Use '/' to define a search first...",178)); iItem = scline(-1,iItem, gd); break; } *************** *** 542,548 **** if (search1[0] == '\0' || ch == '/') if (CURGetOneOption(CursesScreen, GDgetTitle(gd), ! "Search directory titles for:", search1)<0) { iItem = scline(-1,iItem, gd); break; } --- 553,560 ---- if (search1[0] == '\0' || ch == '/') if (CURGetOneOption(CursesScreen, GDgetTitle(gd), ! Gtxt("Search directory titles for:",139) ! , search1)<0) { iItem = scline(-1,iItem, gd); break; } *************** *** 575,583 **** } if (sfound == 0) { search1[0] = '\0'; ! Debug("GetMenu beep search\r\n",NULL) CURBeep(CursesScreen); ! CursesErrorMsg("Search failed..."); } if (ch != 'n') --- 587,595 ---- } if (sfound == 0) { search1[0] = '\0'; ! Debugmsg("GetMenu beep search\r\n") CURBeep(CursesScreen); ! CursesErrorMsg(Gtxt("Search failed...",140)); } if (ch != 'n') diff -c gopher+/gopher/ourutils.c:3.54 gopher+/gopher/ourutils.c:3.60 *** gopher+/gopher/ourutils.c:3.54 Fri May 27 00:08:50 1994 --- gopher+/gopher/ourutils.c Fri May 27 00:08:51 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.54 $ ! * $Date: 1994/04/13 19:14:03 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.60 $ ! * $Date: 1994/05/19 14:08:04 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/ourutils.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,38 ---- ********************************************************************* * Revision History: * $Log: ourutils.c,v $ + * Revision 3.60 1994/05/19 14:08:04 lindner + * use fast malloc on VMS VAXC + * + * Revision 3.59 1994/05/17 05:48:03 lindner + * Massive internationalization change + * + * Revision 3.58 1994/05/14 04:13:46 lindner + * Internationalization... + * + * Revision 3.57 1994/04/29 15:13:17 lindner + * Fix for items with multiple AskL items + * + * Revision 3.56 1994/04/25 18:40:05 lindner + * Fix for uninited variable i + * + * Revision 3.55 1994/04/25 03:37:43 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.54 1994/04/13 19:14:03 lindner * AskL modifications * *************** *** 251,258 **** #endif #include "Debug.h" #include "fileio.h" - int outchar(c) char c; --- 269,276 ---- #endif #include "Debug.h" #include "fileio.h" + #include "Malloc.h" int outchar(c) char c; *************** *** 309,315 **** *SaveName = '\0'; } ! if (CURGetOneOption(CursesScreen, Realname, "Mail current document to:", SaveName)<0) return; --- 327,334 ---- *SaveName = '\0'; } ! if (CURGetOneOption(CursesScreen, Realname, ! Gtxt("Mail current document to:",105), SaveName)<0) return; *************** *** 327,344 **** if (SecureMode) if ( strspn(SaveName, ACHARS) != strlen(SaveName)|| *SaveName == '-') { ! Debug("mail_file - beep - bad char",NULL) puts(CURgetBell(CursesScreen)); fflush(stdout); ! Draw_Status("Address syntax rejected..."); refresh(); return; } if (strchr(Realname, '\"') != NULL) ! Realname = "Gopher File"; ! Draw_Status("Mailing File..."); refresh(); #ifdef VMS --- 346,364 ---- if (SecureMode) if ( strspn(SaveName, ACHARS) != strlen(SaveName)|| *SaveName == '-') { ! Debugmsg("mail_file - beep - bad char") puts(CURgetBell(CursesScreen)); fflush(stdout); ! Draw_Status(Gtxt("Address syntax rejected...",65)); refresh(); return; } if (strchr(Realname, '\"') != NULL) ! Realname = Gtxt("Gopher File",91); ! ! Draw_Status(Gtxt("Mailing File...",106)); refresh(); #ifdef VMS *************** *** 353,359 **** MAIL_COMMAND, Realname, Filename, MailAddress); CURexit(CursesScreen); ! printf("Mailing file to %s...", MailAddress); FIOsystem(command); CURenter(CursesScreen); #else --- 373,379 ---- MAIL_COMMAND, Realname, Filename, MailAddress); CURexit(CursesScreen); ! printf(Gtxt("Mailing file to %s...",107), MailAddress); FIOsystem(command); CURenter(CursesScreen); #else *************** *** 364,370 **** mailit = FIOopenCmdline(command, "w"); if (mailit == NULL || infile == NULL) { ! CursesErrorMsg("System problem, unable to mail"); return; } --- 384,390 ---- mailit = FIOopenCmdline(command, "w"); if (mailit == NULL || infile == NULL) { ! CursesErrorMsg(Gtxt("System problem, unable to mail",173)); return; } *************** *** 419,425 **** choices[viewno] = NULL; choice = CURChoice(CursesScreen, GSgetTitle(gs), choices, ! "Choose a document type", default_choice); Debug("Choice was %d\n", choice); if (choice == -1) return(NULL); --- 439,446 ---- choices[viewno] = NULL; choice = CURChoice(CursesScreen, GSgetTitle(gs), choices, ! Gtxt("Choose a document type",73), ! default_choice); Debug("Choice was %d\n", choice); if (choice == -1) return(NULL); *************** *** 502,507 **** --- 523,549 ---- return(temp); } + void + REQitemdestroy(req) + Requestitem *req; + { + int j; + + if (req->stowage != (char*) NULL) + free(req->stowage); + + if (req->prompt != (char*) NULL) + free(req->prompt); + + if (req->choices != (char**) NULL) { + for (j=0; req->choices[j] != (char*) NULL; j++) + free(req->choices[j]); + free(req->choices); + } + free(req); + + } + /* * Crude implementation of the ASK block stuff. */ *************** *** 527,534 **** return(NULL); /** Can't guess how many askl things we'll have.. **/ ! items = (Requestitem **) malloc(sizeof(Requestitem*)* BLgetNumLines(bl)+50); ! asktypes = (char **) malloc(sizeof(char*) * BLgetNumLines(bl)); reqnum = 0; --- 569,576 ---- return(NULL); /** Can't guess how many askl things we'll have.. **/ ! items = (Requestitem **) malloc(sizeof(Requestitem*)* (BLgetNumLines(bl)+50)); ! asktypes = (char **) malloc(sizeof(char*) * (BLgetNumLines(bl) + 50)); reqnum = 0; *************** *** 597,604 **** items[reqnum]->chooseitem = 1; } ! items[reqnum]->choices[0] = strdup("No"); ! items[reqnum]->choices[1] = strdup("Yes"); items[reqnum]->choices[2] = NULL; } else if (strncasecmp(askline, "AskP:", 5)==0) --- 639,646 ---- items[reqnum]->chooseitem = 1; } ! items[reqnum]->choices[0] = strdup(Gtxt("No",111)); ! items[reqnum]->choices[1] = strdup(Gtxt("Yes",180)); items[reqnum]->choices[2] = NULL; } else if (strncasecmp(askline, "AskP:", 5)==0) *************** *** 607,613 **** int x; items[reqnum]->thing = CUR_LABEL; ! /** Add a bunch more... **/ for (x=0; x < 10; x++) { --- 649,655 ---- int x; items[reqnum]->thing = CUR_LABEL; ! /** Add a bunch more... **/ for (x=0; x < 10; x++) { *************** *** 615,620 **** --- 657,663 ---- items[reqnum] = REQitemnew(); items[reqnum]->prompt = strdup(""); items[reqnum]->thing = CUR_ASKL; + asktypes[reqnum] = NULL; } } *************** *** 636,642 **** if (strcasecmp(asktypes[i], "AskL:")==0) { int alnum, x, extra; char numlinestr[16]; ! i++; /* Skip over note.. */ /** Okay, figure out how many lines were typed **/ for (alnum=9; alnum >= 0; alnum--) { if (*(items[alnum+i]->stowage) != '\0') --- 679,685 ---- if (strcasecmp(asktypes[i], "AskL:")==0) { int alnum, x, extra; char numlinestr[16]; ! /** Okay, figure out how many lines were typed **/ for (alnum=9; alnum >= 0; alnum--) { if (*(items[alnum+i]->stowage) != '\0') *************** *** 671,689 **** } /*** Free memory ***/ for (i=0; i<Asknum; i++) { - if (items[i]->stowage != (char*) NULL) - free(items[i]->stowage); ! if (items[i]->prompt != (char*) NULL) ! free(items[i]->prompt); ! ! if (items[i]->choices != (char**) NULL) { ! for (j=0; items[i]->choices[j] != (char*) NULL; j++) ! free(items[i]->choices[j]); ! free(items[i]->choices); ! } ! ! free(asktypes[i]); } free(items); --- 714,724 ---- } /*** Free memory ***/ for (i=0; i<Asknum; i++) { ! REQitemdestroy(items[i]); ! items[i] = NULL; ! if (asktypes[i]!=NULL) ! free(asktypes[i]); } free(items); *************** *** 724,730 **** errmsg[i] = NULL; ! CURDialog(CursesScreen, "Gopher Transmission Error", errmsg); for (i=0; ; i++) { if (errmsg[i] == NULL) break; --- 759,765 ---- errmsg[i] = NULL; ! CURDialog(CursesScreen, Gtxt("Gopher Transmission Error",95), errmsg); for (i=0; ; i++) { if (errmsg[i] == NULL) break; *************** *** 772,778 **** } ! Draw_Status("Receiving file..."); refresh(); --- 807,813 ---- } ! Draw_Status(Gtxt("Receiving File...",126)); refresh(); *************** *** 803,808 **** --- 838,844 ---- } else { char *colonpos = strchr(buf+5,':'); + i = '\0'; if (colonpos != NULL && *(colonpos-1) != i) { fprintf(f, "-------------------------------------------------------\n"); i = *(colonpos-1); *************** *** 814,820 **** } else { fputs(buf, f); ! putc('\n', f); } if ((line % 25) == 0) twirlfn(); --- 850,858 ---- } else { fputs(buf, f); ! /** Don't cut long lines... **/ ! if (strlen(buf) < sizeof(buf)) ! putc('\n', f); } if ((line % 25) == 0) twirlfn(); *************** *** 831,837 **** while ((numread = readrecvbuf(sockfd, buf, sizeof buf)) > 0) { if (fwrite(buf, numread, 1, f) == 0) { #endif ! CursesErrorMsg("Problems Writing"); closenet(sockfd); return(FALSE); } --- 869,875 ---- while ((numread = readrecvbuf(sockfd, buf, sizeof buf)) > 0) { if (fwrite(buf, numread, 1, f) == 0) { #endif ! CursesErrorMsg(Gtxt("Problems Writing",123)); closenet(sockfd); return(FALSE); } *************** *** 1060,1066 **** case A_TELNET: case A_TN3270: if (saveto == NULL) { ! CursesErrorMsg("Sorry, can't save that item to a file!"); return; } --- 1098,1104 ---- case A_TELNET: case A_TN3270: if (saveto == NULL) { ! CursesErrorMsg(Gtxt("Sorry, can't save that item to a file!",154)); return; } *************** *** 1081,1087 **** /* It shouldnt ever come here if Secure, but I've noticed calls to this in the code */ if (NoShellMode || SecureMode) { ! CursesErrorMsg("You cant do that"); return; } /*** Let them use the Title ***/ --- 1119,1125 ---- /* It shouldnt ever come here if Secure, but I've noticed calls to this in the code */ if (NoShellMode || SecureMode) { ! CursesErrorMsg(Gtxt("Sorry, you are not allowed to do this", 64)); return; } /*** Let them use the Title ***/ *************** *** 1093,1099 **** UNIXfile(Userfilename); #endif ! if (CURGetOneOption(CursesScreen, Title, "Save in file:", Userfilename)<0) return; --- 1131,1137 ---- UNIXfile(Userfilename); #endif ! if (CURGetOneOption(CursesScreen, Title, Gtxt("Save in file:",136), Userfilename)<0) return; *************** *** 1134,1140 **** } else { char tmpstr[256]; ! sprintf(tmpstr, "No such user '%s'", saveto+1); CursesErrorMsg(tmpstr); return; } --- 1172,1178 ---- } else { char tmpstr[256]; ! sprintf(tmpstr, Gtxt("No such user '%s'",114), saveto+1); CursesErrorMsg(tmpstr); return; } *************** *** 1159,1165 **** if (f == NULL) { char tempstr[128]; ! sprintf(tempstr, "Couldn't create '%s'", saveto); CursesErrorMsg(tempstr); return; } --- 1197,1203 ---- if (f == NULL) { char tempstr[128]; ! sprintf(tempstr, Gtxt("Couldn't create '%s'",80), saveto); CursesErrorMsg(tempstr); return; } *************** *** 1170,1176 **** oldfd = open(GSgetLocalFile(gs), O_RDONLY, 0); if (oldfd <0) { ! CursesErrorMsg("Can't open old file.."); if (Openpipe) pclose(f); else --- 1208,1214 ---- oldfd = open(GSgetLocalFile(gs), O_RDONLY, 0); if (oldfd <0) { ! CursesErrorMsg(Gtxt("Can't open old file..",68)); if (Openpipe) pclose(f); else *************** *** 1180,1186 **** while ( (cc=read(oldfd, buf, sizeof buf)) > 0) { if (fwrite(buf, cc, 1, f) <= 0) ! CursesErrorMsg("Problems Writing"); twirl(); } if (Openpipe) --- 1218,1224 ---- while ( (cc=read(oldfd, buf, sizeof buf)) > 0) { if (fwrite(buf, cc, 1, f) <= 0) ! CursesErrorMsg(Gtxt("Problems Writing",123)); twirl(); } if (Openpipe) *************** *** 1231,1237 **** *Userfilename = '\0'; sprintf(Title,"%s", GDgetTitle(gd)); ! if (CURGetOneOption(CursesScreen, Title, "Save list of items in file:", Userfilename)<0) return; saveto = Userfilename; --- 1269,1276 ---- *Userfilename = '\0'; sprintf(Title,"%s", GDgetTitle(gd)); ! if (CURGetOneOption(CursesScreen, Title, ! Gtxt("Save list of items in file:",137), Userfilename)<0) return; saveto = Userfilename; *************** *** 1269,1275 **** } else { char tmpstr[256]; ! sprintf(tmpstr, "No such user '%s'", saveto+1); CursesErrorMsg(tmpstr); return; } --- 1308,1314 ---- } else { char tmpstr[256]; ! sprintf(tmpstr, Gtxt("No such user '%s'",114), saveto+1); CursesErrorMsg(tmpstr); return; } *************** *** 1289,1295 **** if (f == NULL) { char tempstr[128]; ! sprintf(tempstr, "Couldn't create '%s'", saveto); /** Should give better error messages here **/ CursesErrorMsg(tempstr); return; --- 1328,1334 ---- if (f == NULL) { char tempstr[128]; ! sprintf(tempstr, Gtxt("Couldn't create '%s'",80), saveto); /** Should give better error messages here **/ CursesErrorMsg(tempstr); return; *************** *** 1302,1308 **** if ((cp = strstr(buf, Searchstring)) != NULL) *(cp-1) = '\n'; if (fwrite(buf, strlen(buf), 1, f) <= 0) ! CursesErrorMsg("Problems Writing"); twirl(); /*** Write the Items ***/ --- 1341,1347 ---- if ((cp = strstr(buf, Searchstring)) != NULL) *(cp-1) = '\n'; if (fwrite(buf, strlen(buf), 1, f) <= 0) ! CursesErrorMsg(Gtxt("Problems Writing",123)); twirl(); /*** Write the Items ***/ *************** *** 1310,1316 **** for (j = 0; j < numitems; j++) { sprintf(buf, "%s\n", GSgetTitle(GDgetEntry(gd, j))); if (fwrite(buf, strlen(buf), 1, f) <= 0) { ! CursesErrorMsg("Problems Writing"); } twirl(); } --- 1349,1355 ---- for (j = 0; j < numitems; j++) { sprintf(buf, "%s\n", GSgetTitle(GDgetEntry(gd, j))); if (fwrite(buf, strlen(buf), 1, f) <= 0) { ! CursesErrorMsg(Gtxt("Problems Writing",123)); } twirl(); } *************** *** 1359,1365 **** if (strlen(command) == 0) { if (SecureMode || NoShellMode) ! CursesErrorMsg("Sorry, no viewer for the file...."); else Save_file(gs, NULL, view); --- 1398,1404 ---- if (strlen(command) == 0) { if (SecureMode || NoShellMode) ! CursesErrorMsg(Gtxt("Sorry, no viewer for the file....",166)); else Save_file(gs, NULL, view); *************** *** 1386,1392 **** return_status = TPU$TPU(&command_desc); if (!return_status&1) { CURenter(CursesScreen); ! CursesErrorMsg("Error invoking callable TPU as a pager!!!"); return; } } else --- 1425,1431 ---- return_status = TPU$TPU(&command_desc); if (!return_status&1) { CURenter(CursesScreen); ! CursesErrorMsg(Gtxt("Error invoking callable TPU as a pager!!!",85)); return; } } else *************** *** 1403,1409 **** #ifdef VMS ! printf("\nPress %sRETURN%s to continue", CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen)); if (!SecureMode && !NoShellMode) { --- 1442,1448 ---- #ifdef VMS ! printf(Gtxt("\nPress %sRETURN%s to continue",184), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen)); if (!SecureMode && !NoShellMode) { *************** *** 1411,1417 **** printf(",\n "); else printf(", "); ! printf("%sm%s to mail, %sD%s to download, %ss%s to save, or %sp%s to print:", CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), --- 1450,1456 ---- printf(",\n "); else printf(", "); ! printf(Gtxt("%sm%s to mail, %sD%s to download, %ss%s to save, or %sp%s to print:",61), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), *************** *** 1419,1437 **** } #ifndef NOMAIL else { ! printf(", %sm%s to mail, %sD%s to download:", CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen)); } #endif #else ! printf("\nPress <RETURN> to continue"); if (!SecureMode && !NoShellMode) ! printf(",\n <m> to mail, <D> to download, <s> to save, or <p> to print:"); #ifndef NOMAIL else ! printf(", <m> to mail, <D> to download:"); #endif #endif fflush(stdin); --- 1458,1476 ---- } #ifndef NOMAIL else { ! printf(Gtxt(", %sm%s to mail, %sD%s to download:",62), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen), CURgetHighon(CursesScreen), CURgetHighoff(CursesScreen)); } #endif #else ! printf(Gtxt("\nPress <RETURN> to continue",185)); if (!SecureMode && !NoShellMode) ! printf(Gtxt(",\n <m> to mail, <D> to download, <s> to save, or <p> to print:",64)); #ifndef NOMAIL else ! printf(Gtxt(", <m> to mail, <D> to download:",63)); #endif #endif fflush(stdin); *************** *** 1490,1496 **** (void) getchar(); #endif CURenter(CursesScreen); ! Draw_Status("Saving File..."); refresh(); if (!(SecureMode || NoShellMode)) --- 1529,1535 ---- (void) getchar(); #endif CURenter(CursesScreen); ! Draw_Status(Gtxt("Saving File...",138)); refresh(); if (!(SecureMode || NoShellMode)) *************** *** 1502,1508 **** (void) getchar(); #endif if (!RCprintCommand(GlobalRC, view, GSgetLocalFile(gs), command)) { ! CursesErrorMsg("Sorry, cannot print this document"); return; } FIOsystem(command); --- 1541,1547 ---- (void) getchar(); #endif if (!RCprintCommand(GlobalRC, view, GSgetLocalFile(gs), command)) { ! CursesErrorMsg(Gtxt("Sorry, cannot print this document",155)); return; } FIOsystem(command); *************** *** 1525,1532 **** break; default: ! Debug("GSdisplayAfter - beep\r\n",NULL) ! Debug("GSdisplayAfter - beep2\r\n",NULL) puts(CURgetBell(CursesScreen)); fflush(stdout); ch=0; --- 1564,1570 ---- break; default: ! Debugmsg("GSdisplayAfter - beep\r\n"); puts(CURgetBell(CursesScreen)); fflush(stdout); ch=0; *************** *** 1554,1560 **** mess[0] = Message; mess[1] = NULL; ! Debug("CursesMsg - beep\r\n",NULL) CURBeep(CursesScreen); CURDialog(CursesScreen, title,mess); --- 1592,1598 ---- mess[0] = Message; mess[1] = NULL; ! Debugmsg("CursesMsg - beep\r\n") CURBeep(CursesScreen); CURDialog(CursesScreen, title,mess); *************** *** 1572,1578 **** CursesErrorMsg(Message) char *Message; { ! CursesMsg(Message, "Gopher Error"); } --- 1610,1616 ---- CursesErrorMsg(Message) char *Message; { ! CursesMsg(Message, Gtxt("Gopher Error",90)); } diff -c gopher+/gopher/pager.c:3.14 gopher+/gopher/pager.c:3.20 *** gopher+/gopher/pager.c:3.14 Fri May 27 00:08:51 1994 --- gopher+/gopher/pager.c Fri May 27 00:08:51 1994 *************** *** 1,7 **** --- 1,40 ---- + /******************************************************************** + * $Author: lindner $ + * $Revision: 3.20 $ + * $Date: 1994/05/19 14:08:05 $ + * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopher/pager.c,v $ + * $State: Exp $ + * + * Paul Lindner, University of Minnesota CIS. + * + * Copyright 1991, 92, 93, 94 by the Regents of the University of Minnesota + * see the file "Copyright" in the distribution for conditions of use. + ********************************************************************* + * MODULE: pager.c + * neato pager.. + ********************************************************************* + * Revision History: + * $Log: pager.c,v $ + * Revision 3.20 1994/05/19 14:08:05 lindner + * use fast malloc on VMS VAXC + * + * Revision 3.19 1994/05/18 03:59:41 lindner + * Change to FIOsystem() for VMS + * + * Revision 3.18 1994/05/17 05:48:06 lindner + * Massive internationalization change + * + * Revision 3.17 1994/05/14 04:13:47 lindner + * Internationalization... + * + * + *********************************************************************/ + /** Note, uses Global "Searchstring" **/ #include "gopher.h" #include "CURcurses.h" + #include "Malloc.h" #ifdef VMS #include <stat.h> *************** *** 22,39 **** static int currentpage; - char *PagerHelp[9] = - {"u, ^G, left : Return to menu", - "space, down : Move to the next page", - "b, up : Move to the previous page", - "/ : Search for text", - "m : mail current document", - "s : save current document", - "p : print current document", - "D : download current document", - NULL - }; - /* * This is the beginning of a built in pager.. * it is very pretty.. --- 55,60 ---- *************** *** 40,46 **** --- 61,87 ---- * */ + void + PagerHelp(cur) + CursesObj *cur; + { + static char **helpmenu = NULL; + if (helpmenu == NULL) { + helpmenu = (char**) malloc(sizeof(char*) * 9); + helpmenu[0] = Gtxt("u, ^G, left : Return to menu",19); + helpmenu[1] = Gtxt("space, down : Move to the next page",20); + helpmenu[2] = Gtxt("b, up : Move to the previous page",21); + helpmenu[3] = Gtxt("/ : Search for text",22); + helpmenu[4] = Gtxt("m : mail current document",23); + helpmenu[5] = Gtxt("s : save current document",24); + helpmenu[6] = Gtxt("p : print current document",25); + helpmenu[7] = Gtxt("D : download current document",26); + helpmenu[8] = NULL; + } + + CURDialog(cur, Gtxt("Pager Help",18), helpmenu); + } void PagerInitGlobals() *************** *** 88,98 **** /****/ wmove(stdscr, LINES-1,0); ! CURbutton(cur, stdscr, "PageDown: <SPACE>", FALSE); waddch(stdscr, ' '); ! CURbutton(cur, stdscr, "Help: ?", FALSE); waddch(stdscr, ' '); ! CURbutton(cur, stdscr, "Return to Menu: u", FALSE); } --- 129,139 ---- /****/ wmove(stdscr, LINES-1,0); ! CURbutton(cur, stdscr, Gtxt("PageDown: <SPACE>",115), FALSE); waddch(stdscr, ' '); ! CURbutton(cur, stdscr, Gtxt("Help: ?",96), FALSE); waddch(stdscr, ' '); ! CURbutton(cur, stdscr, Gtxt("Return to Menu: u",134), FALSE); } *************** *** 161,167 **** PagerPrintLine(inputline) char *inputline; { ! int lowwordnum, i; char *cp, *lowword; int wlen; --- 202,208 ---- PagerPrintLine(inputline) char *inputline; { ! int lowwordnum = -1, i; char *cp, *lowword; int wlen; *************** *** 281,296 **** /*** Display buttons ***/ wmove(stdscr, LINES - 1, 0); wclrtoeol(stdscr); ! CURbutton(cur, stdscr, "Help: ?", FALSE); waddstr(stdscr, " "); ! CURbutton(cur, stdscr, "Exit: u", FALSE); waddstr(stdscr, " "); if (*bytecount != totalbytes) { ! CURbutton(cur, stdscr, "PageDown: Space", FALSE); waddstr(stdscr, " "); } if (currentpage > 1) ! CURbutton(cur, stdscr, "PageUp: b", FALSE); } /* --- 322,337 ---- /*** Display buttons ***/ wmove(stdscr, LINES - 1, 0); wclrtoeol(stdscr); ! CURbutton(cur, stdscr, Gtxt("Help: ?",96), FALSE); waddstr(stdscr, " "); ! CURbutton(cur, stdscr, Gtxt("Exit: u",86), FALSE); waddstr(stdscr, " "); if (*bytecount != totalbytes) { ! CURbutton(cur, stdscr, Gtxt("PageDown: Space",116), FALSE); waddstr(stdscr, " "); } if (currentpage > 1) ! CURbutton(cur, stdscr, Gtxt("PageUp: b",117), FALSE); } /* *************** *** 305,311 **** char *search; { int i; ! char *cp; do { /** Save current bytecount position **/ --- 346,352 ---- char *search; { int i; ! char *cp = NULL; do { /** Save current bytecount position **/ *************** *** 365,371 **** thefile = fopen(GSgetLocalFile(gs), "r"); if (thefile == NULL) { ! CursesErrorMsg("Cannot Open requested file.."); return; } --- 406,412 ---- thefile = fopen(GSgetLocalFile(gs), "r"); if (thefile == NULL) { ! CursesErrorMsg(Gtxt("Cannot Open requested file..",71)); return; } *************** *** 435,447 **** case KEY_HELP: case 'h': case '?': ! CURDialog(cur, "Pager Help", PagerHelp); ! touchwin(stdscr); break; case 'p': if (SecureMode || NoShellMode) { ! CursesErrorMsg("Sorry, you are not allowed to print files"); touchwin(stdscr); break; } --- 476,487 ---- case KEY_HELP: case 'h': case '?': ! PagerHelp(cur); break; case 'p': if (SecureMode || NoShellMode) { ! CursesErrorMsg(Gtxt("Sorry, you are not allowed to print files",161)); touchwin(stdscr); break; } *************** *** 449,469 **** GSgetLocalFile(gs), command) || !strncasecmp(command, "- none -", 8) || strlen(command) == 0) { ! CursesErrorMsg("Sorry, no method to print this document"); touchwin(stdscr); break; } ! Dialogmess[0] = strdup("The filename is:"); Dialogmess[1] = strdup(GSgetLocalFile(gs)); Dialogmess[2] = NULL; ! if (CURDialog(cur, "Print current document", Dialogmess) != -1) { ! #ifdef VMS ! if (!system(command)) ! #else ! if (system(command)) ! #endif ! CursesErrorMsg("Encountered printing problem, sorry..."); } free(Dialogmess[0]); --- 489,505 ---- GSgetLocalFile(gs), command) || !strncasecmp(command, "- none -", 8) || strlen(command) == 0) { ! CursesErrorMsg(Gtxt("Sorry, no method to print this document",156)); touchwin(stdscr); break; } ! Dialogmess[0] = strdup(Gtxt("The filename is:",174)); Dialogmess[1] = strdup(GSgetLocalFile(gs)); Dialogmess[2] = NULL; ! if (CURDialog(cur, Gtxt("Print current document",122), Dialogmess) != -1) { ! if (FIOsystem(command)) ! CursesErrorMsg(Gtxt("Encountered printing problem, sorry...",84)); } free(Dialogmess[0]); *************** *** 478,484 **** if (!(SecureMode || NoShellMode)) Save_file(gs, NULL, GSgetLocalView(gs)); else ! CursesErrorMsg("Sorry, you are not allowed to save files"); touchwin(stdscr); break; --- 514,520 ---- if (!(SecureMode || NoShellMode)) Save_file(gs, NULL, GSgetLocalView(gs)); else ! CursesErrorMsg(Gtxt("Sorry, you are not allowed to save files",162)); touchwin(stdscr); break; *************** *** 503,509 **** case '/': /** Search ... ***/ if ((CURGetOneOption(CursesScreen, "", ! "Search text for:", slashstring) < 0) || (slashstring[0] == '\0')) { touchwin(stdscr); break; --- 539,546 ---- case '/': /** Search ... ***/ if ((CURGetOneOption(CursesScreen, "", ! Gtxt("Search text for:",141), ! slashstring) < 0) || (slashstring[0] == '\0')) { touchwin(stdscr); break; *************** *** 512,518 **** case 'n': /** Next occurrence, and fall through from above.. **/ if (slashstring[0] == '\0') { ! CursesErrorMsg("Use '/' to define search first..."); touchwin(stdscr); break; } --- 549,555 ---- case 'n': /** Next occurrence, and fall through from above.. **/ if (slashstring[0] == '\0') { ! CursesErrorMsg(Gtxt("Use '/' to define search a first...",178)); touchwin(stdscr); break; } *************** *** 523,529 **** PagerSeekPage(thefile, currentpage-1, &bytecount); if (!PagerSearch(thefile, theline, &bytecount, slashstring)) { ! CursesErrorMsg("Couldn't find text"); touchwin(stdscr); PagerSeekPage(thefile, savedpagenum-1, &bytecount); PagerNextPage(cur, thefile, theline, &bytecount, --- 560,566 ---- PagerSeekPage(thefile, currentpage-1, &bytecount); if (!PagerSearch(thefile, theline, &bytecount, slashstring)) { ! CursesErrorMsg(Gtxt("Couldn't find text",82)); touchwin(stdscr); PagerSeekPage(thefile, savedpagenum-1, &bytecount); PagerNextPage(cur, thefile, theline, &bytecount, diff -c /dev/null gopher+/gopher/locales/En_US.msg:1.1 *** /dev/null Fri May 27 00:08:52 1994 --- gopher+/gopher/locales/En_US.msg Fri May 27 00:08:52 1994 *************** *** 0 **** --- 1,237 ---- + $ + $ Welcome message... + $ + + $quote " + + 1 "Welcome to the wonderful world of Gopher!\n\n" + 2 "Gopher has limitations on its use and comes without\n" + 3 "a warranty. Please refer to the file 'Copyright' included\n" + 4 "in the distribution.\n\n" + + 5 "Copyright 1991,92,93,94 by the Regents of the University of Minnesota\n\n" + 6 "Internet Gopher Information Client %s.%s patch%d\n" + 7 "Press RETURN to continue\n" + + $ + $ Errors in .gopherrc + $ + 8 "Can't write gopher configuration file!!" + + $ + $ Help for command line + $ + + 9 "Usage: %s [-sSbDr] [-T type] [-p path] [-t title] [hostname port]+\n" + 10 " -s secure mode, users without own account\n" + 11 " -S secure mode, users with own account\n" + 12 " -p path specify path to initial item\n" + 13 " -T type Type of initial item\n" + 14 " -i Search argument (for -T 7)\n" + 15 " -b Bookmarks first\n" + 16 " -r Remote user\n" + 17 " -D Debug mode\n" + + $ + $ Pager help.. + $ + + 18 "Pager Help" + 19 "u, ^G, left : Return to menu" + 20 "space, down : Move to the next page" + 21 "b, up : Move to the previous page" + 22 "/ : Search for text" + 23 "m : mail current document" + 24 "s : save current document" + 25 "p : print current document" + 26 "D : download current document" + + $ + $ New Application Menu + $ + 27 "Content-Type Name" + 28 "Display Application" + 29 "Printing Application" + + $ + $ Top Level Options + $ + 30 "General Options" + 31 "Configure Display Applications" + 32 "Configure Printing Applications" + 33 "Define New Content-Type" + + $ + $ Telnet connection + $ + 34 "Warning!!!!!, you are about to leave the Internet" + 35 "Gopher program and connect to another host. If" + 36 "you get stuck press the control key and the" + 37 "] key, and then type quit" + 38 "^ key, and then type q." + 39 "Connecting to %.40s, port %d using %s." + 40 "Connecting to %.40s using %s." + 41 "Use the account name \"%.40s\" to log in" + $ + $ HTML menu + $ + 42 "Warning!!!!!, you are about to leave the Internet Gopher" + 43 "Client and connect to an HTML Browser. Use the Browser" + 44 "Help if you are not familiar with its commands." + 45 "Upon quitting from the Browser, you will be returned to" + 46 "the Internet Gopher Client." + $ + $ Other html msgs + $ + 47 "Sorry, this client does not support HTML" + + $ + $ gopher.c + $ + 48 "Can't find an administrator for this item, sorry!" + + $ + $ Gripe form msgs + $ + 49 "Hit the Enter key to send your message." + 50 "Hit the Tab key at the end of each line you type." + 51 "Subject" + 52 "Problem" + 53 "Cannot send mail..." + 54 "Mailing gripe to %s..." + 55 "Words to search for" + 56 " Page: %d/%d" + 57 " for Help, " + 58 " to Quit" + 59 " to go up a menu" + 60 "%s: Nothing received for main menu, can't continue\n" + 61 "%sm%s to mail, %sD%s to download, %ss%s to save, or %sp%s to print:" + 62 ", %sm%s to mail, %sD%s to download:" + 63 ", <m> to mail, <D> to download:" + 64 ",\n <m> to mail, <D> to download, <s> to save, or <p> to print:" + 65 "Address syntax rejected..." + 66 "Bold Search words in Builtin Pager" + 67 "Bookmarks" + 68 "Can't open old file.." + 69 "Can't write to SYS$SCRATCH!" + 70 "Can't write to the /tmp directory!" + 71 "Cannot Open requested file.." + 72 "Cannot connect to host %.40s, port %d." + 73 "Choose a document type" + 74 "Choose a download method" + 75 "Connect to a new Gopher Server" + 76 "Connect to an anonymous FTP Server via the Gopher gateway" + 77 "Connecting..." + 78 "Connection failed: %s." + 79 "Connection to remote host failed." + 80 "Couldn't create '%s'" + 81 "Couldn't execute %s\n" + 82 "Couldn't find text" + 83 "Couldn't make a tmp file!\n" + 84 "Encountered printing problem, sorry..." + 85 "Error invoking callable TPU as a pager!!!" + 86 "Exit: u" + 87 "Fetching Fields..." + 88 "File didn't transfer successfully" + 89 "Gopher Directory Information" + 90 "Gopher Error" + 91 "Gopher File" + 92 "Gopher Help File" + 93 "Gopher Item Information" + 94 "Gopher Options" + 95 "Gopher Transmission Error" + 96 "Help: ?" + 97 "Home Gopher server: %.59s" + 98 "Host to query:" + 99 "Hostname" + 100 "Hostname is unknown." + 101 "I don't understand your terminal type\n" + 102 "Internet Gopher Information Client v%s.%s.%d" + 103 "Link Info" + 104 "Local Date and Time" + 105 "Mail current document to:" + 106 "Mailing File..." + 107 "Mailing file to %s..." + 108 "Movie viewing not yet implemented" + 109 "Name for this bookmark:" + 110 "Network Error" + 111 "No" + 112 "No bookmarks are defined" + 113 "No display command is mapped to this view!" + 114 "No such user '%s'" + 115 "PageDown: <SPACE>" + 116 "PageDown: Space" + 117 "PageUp: b" + 118 "Port" + 119 "Press " + 120 "Press <RETURN> to continue" + 121 "Press <RETURN> when you're ready\n" + 122 "Print current document" + 123 "Problems Writing" + 124 "Really quit (y/n) ?" + 125 "Receiving Directory..." + 126 "Receiving File..." + 127 "Receiving HTML page..." + 128 "Receiving Information..." + 129 "Receiving MIME File..." + 130 "Receiving Movie..." + 131 "Receiving Sound..." + 132 "Receiving Image..." + 133 "Retrieving Directory..." + 134 "Return to Menu: u" + 135 "Root menu: " + 136 "Save in file:" + 137 "Save list of items in file:" + 138 "Saving File..." + 139 "Search directory titles for:" + 140 "Search failed..." + 141 "Search text for:" + 142 "Searching Text..." + 143 "Searching..." + 144 "Selector (Optional)" + 145 "Show host's local date and time" + 146 "Size Language Document Type\n" + 147 "---------- ------------- ----------------------------\n" + 148 "Sorry, cannot display this file" + 149 "Sorry, can't delete top level directory." + 150 "Sorry, can't download that!" + 151 "Sorry, can't make a bookmark of bookmarks" + 152 "Sorry, can't save files with this account" + 153 "Sorry, can't spawn in with this account" + 154 "Sorry, can't save that item to a file!" + 155 "Sorry, cannot print this document" + 156 "Sorry, no method to print this document" + 157 "Sorry, telnet is not available." + 158 "Sorry, this machine doesn't support images" + 159 "Sorry, this machine doesn't support sounds" + 160 "Sorry, tn3270 is not available." + 161 "Sorry, you are not allowed to print files" + 162 "Sorry, you are not allowed to save files" + 163 "Sorry, you are not allowed to set options in secure mode." + 164 "Sorry, you're not allowed to do this" + 165 "Sorry, this machine doesn't support movies" + 166 "Sorry, no viewer for the file...." + 167 "Spawn to DCL failed!" + 168 "Spawn to default shell failed!" + 169 "Spawning DCL subprocess. Logout to return to Gopher.\n" + 170 "Spawning your default shell. Type 'exit' to return to Gopher.\n\n" + 171 "Start your capture now...\n\n" + 172 "Start your download now...\n" + 173 "System problem, unable to mail" + 174 "The filename is:" + 175 "Unable to allocate a socket." + 176 "Unix piping requested. Check your configuration!" + 177 "Unknown error." + 178 "Use '/' to define a search first..." + 179 "View item number: " + 180 "Yes" + 181 "Your Choice" + 182 "\nDownload Complete. %d total bytes, %d bytes/sec\n" + 183 "\nDownload could not be completed, sorry... \n" + 184 "\nPress %sRETURN%s to continue" + 185 "\nPress <RETURN> to continue" + 186 "\n\nServer Information\n" + 187 "anonymous FTP Host" + 188 "gopher: Nothing received for main menu, can't continue\n" + + diff -c /dev/null gopher+/gopher/locales/Es.msg:1.4 *** /dev/null Fri May 27 00:08:52 1994 --- gopher+/gopher/locales/Es.msg Fri May 27 00:08:53 1994 *************** *** 0 **** --- 1,241 ---- + $ + $ Translation courtesy of Fernando Garcia-Loygorri <fernando@ender.upc.es> + $ + + $ + $ Welcome message... + $ + + $quote " + + 1 "íBienvenido al maravilloso mundo de Gopher!\n\n" + 2 "Hay limitaciones en el uso de Gopher y no estß\n" + 3 "garantizado. Por favor, lea el fichero 'Copyright' incluφdo\n" + 4 "en el paquete.\n\n" + + 5 "Copyright 1991,92,93,94 by the Regents of the Universidad of Minnesota\n\n" + 6 "Cliente de Informaci≤n de Gopher de Internet %s.%s parche%d\n" + 7 "Pulse INTRO para continuar\n" + + $ + $ Errors in .gopherrc + $ + 8 "íNo puedo escribir el fichero de configuraci≤n de Gopher!" + + $ + $ Help for command line + $ + + 9 "Usage: %s [-sSbDr] [-T type] [-p path] [-t title] [hostname port]+\n" + 10 " -s Modo seguro, usuarios sin cuenta propia\n" + 11 " -S Modo seguro, usuarios con cuenta propia\n" + 12 " -p senda Especificaci≤n de la senda al elemento inicial\n" + 13 " -T tipo Tipo de elemento inicial\n" + 14 " -i Argumento de b·squeda (para -T 7)\n" + 15 " -b Primero los recordatorios\n" + 16 " -r Usuario remoto\n" + 17 " -D Modo de depuraci≤n\n" + + $ + $ Pager help.. + $ + + 18 "Ayuda sobre el compaginador" + 19 "u, ^G, izquierda : Volver al men·" + 20 "espacio, abajo : Ir a la siguiente pßgina" + 21 "b, arriba : Ir a la pßgina anterior" + 22 "/ : Buscar en el texto" + 23 "m : Enviar por correo el documento actual" + 24 "s : Guardar el documento actual" + 25 "p : Imprimir el documento actual" + 26 "D : Descargar el documento actual" + + $ + $ New Application Menu + $ + 27 "Nombre del tipo de contenido" + 28 "Aplicaci≤n de presentaci≤n" + 29 "Aplicaci≤n de impresi≤n" + + $ + $ Top Level Options + $ + 30 "Opciones generales" + 31 "Configuraci≤n de las aplicaciones de presentaci≤n" + 32 "Configuraci≤n de las aplicaciones de impresi≤n" + 33 "Definici≤n de un tipo de contenido nuevo" + + $ + $ Telnet connection + $ + 34 "íííAviso!!!, va a abandonar el programa Gopher" + 35 "de Internet y a conectarse a otro ordenador. Si" + 36 "se queda atascado, pulse la tecla de Control junto" + 37 "con la tecla ] y despuΘs teclee quit" + 38 "tecla ^ y despuΘs teclee q." + 39 "Conectando a %.40s, puerta %d usando %s." + 40 "Conectando a %.40s usando %s." + 41 "Use el nombre de cuenta \"%.40s\" para entrar" + $ + $ HTML menu + $ + 42 "íííAviso!!!, va a abandonar el cliente Gopher de" + 43 "Internet y a conectarse a un Lector de HTML. Use la Ayuda" + 44 "del Lector si no estß familiarizado con sus ≤rdenes." + 45 "Al salir del Lector, serß devuelto al cliente Gopher" + 46 "de Internet." + $ + $ Other html msgs + $ + 47 "Lo sienta, este cliente no da soporte a HTML" + + $ + $ gopher.c + $ + 48 "Lo siento, no puedo encontrar un administrador para este elemento" + + $ + $ Gripe form msgs + $ + 49 "Pulse la tecla Intro para enviar su mensaje." + 50 "Pulse la tecla de tabulaci≤n al final de cada lφnea que escriba." + 51 "Sujecto" + 52 "Problema" + 53 "Cannot send mail..." + 54 "Enviando una queja a %s..." + 55 "Palabras a buscar" + 56 " Pßgina: %d/%d" + 57 " para la Ayuda, " + 58 " para Salir" + 59 " para subir un men·" + 60 "%s: No se ha recibido el men· principal, no es posible seguir\n" + 61 "%sm%s para enviar por correo, %sD%s para descargar, %ss%s para guardar o %sp%s para imprimir:" + 62 ", %sm%s para enviar por correo, %sD%s para descargar:" + 63 ", <m> para enviar por correo, <D> para descargar:" + 64 "\n <m> para enviar por correo, <D> para descargar, <s> para guardar o <p> para imprimir:" + 65 "La sintaxis de la direcci≤n ha sido rechazada..." + 66 "Palabras buscadas en negrita en el compaginador interno" + 67 "Recordatorios" + 68 "No puedo abrir el antiguo fichero.." + 69 "íNo puedo escribir en SYS$SCRATCH!" + 70 "íNo puedo escribir en el directorio /tmp!" + 71 "No puedo abrir el fichero solicitado.." + 72 "No puedo conectar al ordenador %.40s, puerta %d." + 73 "Elija un tipo de documento" + 74 "Elija un mΘtodo de descarga" + 75 "Conexi≤n a otro servidor de Gopher" + 76 "Conexi≤n a un servidor de FTP an≤nimo vφa la pasarela Gopher" + 77 "Conectando..." + 78 "Fallo en la conexi≤n: %s." + 79 "Fallo en la conexi≤n al ordenador remoto." + 80 "No he podido crear '%s'" + 81 "No he podido ejecutar %s\n" + 82 "No he podido encontrar el texto" + 83 "íNo he podido crear un fichero temporal!\n" + 84 "Lo siento, ha habido un problema al imprimir..." + 85 "íError al invocar una TPU como compaginador!" + 86 "Salir: u" + 87 "Extrayendo campos..." + 88 "El fichero no fue transferido con Θxito" + 89 "Informaci≤n sobre el directorio de Gopher" + 90 "Error de Gopher" + 91 "Fichero de Gopher" + 92 "Fichero de ayuda de Gopher" + 93 "Informaci≤n sobre elemento de Gopher" + 94 "Opciones de Gopher" + 95 "Error de transmisi≤n de Gopher" + 96 "Ayuda: ?" + 97 "Servidor de Gopher inicial: %.59s" + 98 "Ordenador al que interrogar:" + 99 "Nombre de ordenador" + 100 "Nombre de ordenador desconocido." + 101 "No puedo establecer el tipo de su terminal\n" + 102 "Cliente de Informaci≤n de Gopher de Internet v%s.%s.%d" + 103 "Informaci≤n sobre enlaces" + 104 "Fecha y hora locales" + 105 "Enviar por correo el documento actual a:" + 106 "Enviando el fichero..." + 107 "Enviando el fichero a %s..." + 108 "A·n no se ha implementado el pase de pelφculas" + 109 "Nombre de este recordatorio:" + 110 "Error en la red" + 111 "No" + 112 "No hay recordatorios definidos" + 113 "íNo hay una orden de presentaci≤n asignada a esta vista!" + 114 "El usuario '%s' no existe" + 115 "Siguiente pßgina: <ESPACIO>" + 116 "Siguiente pßgina: Espacio" + 117 "Pßgina anterior: b" + 118 "Puerta" + 119 "Pulse " + 120 "Pulse <INTRO> para continuar" + 121 "Pulse <INTRO> cuando estΘ listo\n" + 122 "Imprimir el documento actual" + 123 "Hay problemas escribiendo" + 124 "┐Quiere realmente salir (y=sφ/n=no) ?" + 125 "Recibiendo directorio..." + 126 "Recibiendo fichero..." + 127 "Recibiendo pßgina de HTML..." + 128 "Recibiendo informaci≤n..." + 129 "Recibiendo fichero MIME..." + 130 "Recibiendo pelφcula..." + 131 "Recibiendo sonido..." + 132 "Receiving Image..." + 133 "Extrayendo directorio..." + 134 "Volver al Men·: u" + 135 "Men· raφz: " + 136 "Guardar en fichero:" + 137 "Guardar lista de elementos en fichero:" + 138 "Guardando fichero..." + 139 "B·squeda en tφtulos de directorios de:" + 140 "B·squeda sin Θxito..." + 141 "B·squeda en texto de:" + 142 "Buscando texto..." + 143 "Buscando..." + 144 "Seleccionador (Opcional)" + 145 "Mostrar la fecha y hora locales en el ordenador remoto" + 146 "Tama±o Lenguaje Tipo de Documento\n" + 147 "---------- ------------- ----------------------------\n" + 148 "Lo siento, no puedo mostrar este fichero" + 149 "Lo siento, no puedo borrar el directorio de mßs alto nivel." + 150 "íLo siento, no puedo descargar eso!" + 151 "Lo siento, no puedo hacer un recordatorio de recordatorios" + 152 "Lo siento, con esta cuenta no es posible guardar ficheros" + 153 "Lo siento, con esta cuenta no es posible iniciar otro proceso" + 154 "íLo siento, no puedo guardar ese elemento en un fichero!" + 155 "Lo siento, no puedo imprimir este documento" + 156 "Lo siento, no hay mecanismo para imprimir este documneto" + 157 "Lo siento, telnet no estß disponible." + 158 "Lo siento, esta mßquina no da soporte a imßgenes" + 159 "Lo siento, esta mßquina no da soporte a sonidos" + 160 "Lo siento, tn3270 no estß disponible." + 161 "Lo siento, Ud. no estß autorizado a imprimir ficheros" + 162 "Lo siento, Ud. no estß autorizado a guardar ficheros" + 163 "Sorry, you are not allowed to set options in secure mode." + 164 "Lo siento, Ud. no estß autorizado a hacer esto" + 165 "Sorry, this machine doesn't support movies" + 166 "Sorry, no viewer for the file...." + 167 "íHa fallado el inicio del subproceso DCL!" + 168 "íHa fallado el inicio del intΘrprete de ≤rdenes habitual!" + 169 "Iniciando el subproceso DCL. Salga para volver a Gopher.\n" + 170 "Iniciando su intΘrprete de ≤rdenes habitual. Teclee 'exit' para volver\na Gopher.\n\n" + 171 "Comience ahora su captura de datos...\n\n" + 172 "Comience ahora su descarga de datos...\n" + 173 "Problema en el sistema, no es posible enviar correo" + 174 "El nombre del fichero es" + 175 "No es posible reservar un z≤calo." + 176 "Se ha solicitado un empalme de Unix. íCompruebe su configuraci≤n!" + 177 "Error desconocido." + 178 "Use '/' para primero definir una b·squeda..." + 179 "Ver elemento n·mero:" + 180 "Sφ" + 181 "Elija" + 182 "\nCompletada la descarga. %d bytes en total, %d bytes/sec.\n" + 183 "\nLo siento, no ha sido posible completar la descarga... \n" + 184 "\nPulse %sINTRO%s para continuar" + 185 "\nPulse <INTRO> para continuar" + 186 "\n\nInformaci≤n del servidor\n" + 187 "Ordenador para FTP an≤nimo" + 188 "gopher: No se ha recibido el men· principal, no es posible seguir\n" + + diff -c /dev/null gopher+/gopher/locales/Fr.msg:1.2 *** /dev/null Fri May 27 00:08:53 1994 --- gopher+/gopher/locales/Fr.msg Fri May 27 00:08:53 1994 *************** *** 0 **** --- 1,242 ---- + $ + $ Translation courtesy of Sylvie St. Georges <St-Georges.Sylvie@uqam.ca> + $ + + + $ + $ Welcome message... + $ + + $quote " + + 1 "Bienvenue dans l'univers merveilleux de Gopher!\n\n" + 2 "Gopher ne comprend aucune garantie et son utilisation n'est pas\n" + 3 "sans restriction. S.V.P. se rΘfΘrer au fichier 'Copyright'\n" + 4 "inclus dans la distribution.\n\n" + + 5 "Copyright 1991,92,93,94 by the Regents of the University of Minnesota\n\n" + 6 "Client d'information Gopher pour l'Internet %s.%s rΘvision%d\n" + 7 "Press <RETURN> to continue" + + $ + $ Errors in .gopherrc + $ + 8 "Impossible d'Θcrire dans le fichier de configuration de gopher!!" + + $ + $ Help for command line + $ + + 9 "Usage: %s [-sSbDr] [-T type] [-p chemin] [-t title] [Nom du serveur] [port]+\n" + 10 " -s Mode sΘcuritaire, utilisateurs sans code d'accΦs\n" + 11 " -S Mode sΘcuritaire, utilisateurs avec un code d'accΦs\n" + 12 " -p chemin chemin d'accΦs pour le premier ΘlΘment\n" + 13 " -T type Type du premier ΘlΘment\n" + 14 " -i ParamΦtre de recherche (pour -T 7)\n" + 15 " -b Signets comme Θcran d'entrΘe\n" + 16 " -r Utilisateur avec accΦs α distance\n" + 17 " -D Mode d'Θpuration\n" + + $ + $ Pager help.. + $ + + 18 "Aide pour le dΘfileur d'Θcran" + 19 "u, ^G, flΦche vers la gauche : Retourne au menu" + 20 "barre d'espacement, flΦche vers le bas: Affiche la page suivante" + 21 "b, flΦche vers le haut : Affiche la page prΘcΘdente" + 22 "/ : Active la recherche" + 23 "m : Envoie le document par courrier" + 24 "s : Sauvegarde le document" + 25 "p : Imprime le document" + 26 "D : Active le tΘlΘchargement" + + $ + $ New Application Menu + $ + 27 "Type du contenu" + 28 "Progamme de visualisation" + 29 "Programme d'impression" + + $ + $ Top Level Options + $ + 30 "Options gΘnΘrales" + 31 "Configuration pour la visualisation" + 32 "Configuration pour l'impression" + 33 "Nouveau type de contenu" + + $ + $ Telnet connection + $ + 34 "Attention!!!!!, vous allez quitter le programme" + 35 "Gopher pour vous connecter sur un autre ordinateur." + 36 "En cas de problΦme, pressez simultanΘment les touches" + 37 "Ctrl et ] puis tapez quit." + 38 "Ctrl et ^ puis tapez q." + 39 "Connexion α %.40s, port %d par %s." + 40 "Connexion α %.40s par %s." + 41 "Au login, utilisez le nom d'usager \"%.40s\"" + $ + $ HTML menu + $ + 42 "Attention!!!!!, vous allez quitter le client Gopher" + 43 "pour vous connecter α un lecteur de fichiers HTML." + 44 "Consultez l'aide HTML pour une description des commandes." + 45 "En quittant le lecteur HTML, vous retournerez au client" + 46 "Gopher." + $ + $ Other html msgs + $ + 47 "Sorry, this client does not support HTML" + + $ + $ gopher.c + $ + 48 "Can't find an administrator for this item, sorry!" + + $ + $ Gripe form msgs + $ + 49 "Appuyez sur Enter pour envoyer votre message." + 50 "Appuyez sur Tab α la fin de chaque ligne que vous tapez." + 51 "Sujet" + 52 "ProblΦme" + 53 "Impossible d'envoyer du courrier..." + 54 "Commentaires envoyΘs α %s..." + 55 "Rechercher les mots-clΘs:" + 56 " Page: %d/%d" + 57 " pour Aide, " + 58 " pour Quitter" + 59 " pour menu PrΘcΘdent" + 60 "%s: Aucune information disponible dans le menu principal,\n impossible de continuer\n" + 61 "%sm%s courrier, %sD%s tΘlΘcharger, %ss%s sauvegarder, ou %sp%s" + 62 ", %sm%s courrier, %sD%s tΘlΘcharger:" + 63 ", <m> courrier, <D> tΘlΘcharger:" + 64 ",\n <m> courrier, <D> tΘlΘcharger, <s> sauvegarder, ou <p> imprimer:" + 65 "Erreur de syntaxe dans l'adresse..." + 66 "Mots recherchΘs apparaissant en caractΦres gras" + 67 "Menu des signets" + 68 "Impossible d'ouvrir l'ancien fichier.." + 69 "Impossible d'Θcrire dans SYS$SCRATCH!" + 70 "Impossible d'Θcrire dans le rΘpertoire /tmp!" + 71 "Impossible d'ouvrir le fichier.." + 72 "Connexion α %.40s, port %d impossible." + 73 "Choisissez un type de document" + 74 "Choisissez le mode de tΘlΘchargement:" + 75 "Connexion α un autre serveur Gopher" + 76 "Connexion α un serveur FTP anonymous par la passerelle Gopher" + 77 "Connexion en cours..." + 78 "ProblΦme de connexion: %s." + 79 "ProblΦme de connexion avec l'autre ordinateur." + 80 "Impossible de crΘer '%s'" + 81 "Impossible d'exΘcuter %s\n" + 82 "Recherche infructueuse" + 83 "Impossible de crΘer le fichier tmp!\n" + 84 "DΘsolΘ! ProblΦme d'impression..." + 85 "Erreur dans l'appel de TPU comme dΘfileur d'Θcran!!!" + 86 "Sortie: u" + 87 "Champs disponibles..." + 88 "Erreur survenue pendant le transfert" + 89 "Information sur un rΘpertoire Gopher" + 90 "Erreur Gopher" + 91 "Fichier Gopher" + 92 "Fichier d'aide Gopher" + 93 "Information sur un ΘlΘment Gopher" + 94 "Options pour Gopher" + 95 "Erreur de transmission Gopher" + 96 "Aide: ?" + 97 "Serveur Gopher primaire: %.59s" + 98 "Ordinateur α interroger:" + 99 "Nom du serveur" + 100 "Ce nom d'ordinateur est inconnu." + 101 "Je ne peux identifier votre type de terminal\n" + 102 "Client d'information Gopher pour l'Internet v%s.%s.%d" + 103 "Information sur le lien" + 104 "Date et heure locales" + 105 "Envoi du document par courrier α:" + 106 "Envoi du fichier par courrier..." + 107 "Envoi du fichier par courrier α %s..." + 108 "Visualisation pour l'animation non disponible" + 109 "Nom pour ce signet:" + 110 "Erreur de rΘseau" + 111 "Non" + 112 "Aucun signet n'est dΘfini" + 113 "Aucune commande de visualisation n'a ΘtΘ assignΘe pour cette option!" + 114 "Usager '%s' inconnu" + 115 "PageSuivante: <ESPACE>" + 116 "PageSuivante: Espace" + 117 "PagePrΘcΘdente: b" + 118 "Port" + 119 "Appuyez sur " + 120 "Appuyez sur <RETOUR> pour continuer" + 121 "Appuyez sur <RETOUR> lorsque vous serez prΩt\n" + 122 "Appuyez sur RETOUR pour continuer\n" + 123 "Impression en cours" + 124 "DΘsirez-vous quitter (o/n) ?" + 125 "RΘception du rΘpertoire..." + 126 "RΘception du fichier..." + 127 "RΘception de la page HTML..." + 128 "RΘception de l'information.." + 129 "RΘception du fichier MIME..." + 130 "RΘception du fichier d'animation..." + 131 "RΘception du fichier de son..." + 132 "RΘception du graphiques..." + 133 "Recherche du rΘpertoire..." + 134 "Retour au menu: u" + 135 "Menu principal: " + 136 "Sauvegarder dans le fichier:" + 137 "Menu sauvegardΘ dans le fichier:" + 138 "Sauvegarde du fichier..." + 139 "Recherche dans le menu pour:" + 140 "Recherche infructueuse..." + 141 "Recherche dans le texte pour:" + 142 "Recherche le texte..." + 143 "Recherche..." + 144 "SΘlecteur (Optionnel)" + 145 "Affichage de la date et de l'heure locales d'un site" + 146 "Taille Langage Type de document\n" + 147 "---------- ------------- ----------------------------\n" + 148 "DΘsolΘ, impossible de visualiser ce fichier" + 149 "DΘsolΘ, ce dernier ΘlΘment ne peut Ωtre effacΘ." + 150 "DΘsolΘ, impossible α tΘlΘcharger!" + 151 "DΘsolΘ, le menu des signets ne peut Ωtre dΘfini comme un nouveau signet" + 152 "DΘsolΘ, il ne vous est pas permis de sauvegarder des fichiers" + 153 "DΘsolΘ, cet ΘlΘment ne peut Ωtre sauvegardΘ!" + 154 "DΘsolΘ, cette option ne vous est pas permise" + 155 "DΘsolΘ, impossible d'imprimer ce document" + 156 "DΘsolΘ, mΘthode d'impression non disponible pour ce document" + 157 "DΘsolΘ, telnet n'est pas disponible." + 158 "DΘsolΘ, ce client ne supporte pas HTML" + 159 "DΘsolΘ, cet ordinateur ne supporte pas les fichiers sonores" + 160 "DΘsolΘ, tn3270 n'est pas disponible." + 161 "DΘsolΘ, il ne vous est pas permis d'imprimer des fichiers" + 162 "DΘsolΘ, il ne vous est pas permis de sauvegarder des fichiers" + 163 "Sorry, you are not allowed to set options in secure mode." + 164 "DΘsolΘ, cette option ne vous est pas permise" + 165 "Sorry, this machine doesn't support movies" + 166 "Sorry, no viewer for the file...." + 167 "Impossible d'accΘder au DCL!" + 168 "Impossible d'accΘder au shell implicite!" + 169 "Passage au DCL. Quittez (logout) pour revenir α Gopher.\n" + 170 "Passage au shell implicite. Tapez 'exit' pour revenir α Gopher.\ n\n" + 171 "PrΘparez la rΘception pour la saisie d'Θcran ...\n\n" + 172 "PrΘparez la rΘception pour le tΘlΘchargement...\n" + 173 "ProblΦme de systΦme, impossible d'envoyer du courrier" + 174 "Le nom du fichier est:" + 175 "ProblΦme d'allocation de port." + 176 "Redirection Unix demandΘe. VΘrifiez votre configuration!" + 177 "Erreur inconnue." + 178 "Utilisez '/' pour une premiΦre recherche..." + 179 "Afficher le numΘro: " + 180 "Oui" + 181 "Votre choix" + 182 "\nTΘlΘchargement complΘtΘ. %d octets au total, %d octets/sec\n" + 183 "\nDΘsolΘ, tΘlΘchargement non complΘtΘ... \n" + 184 "\nAppuyez sur %sRETOUR%s pour continuer" + 185 "\nAppuyez sur <RETOUR> pour continuer" + 186 "\n\nServeur d'information\n" + 187 "Site FTP anonymous" + 188 "gopher: Aucune information disponible dans le menu principal,\nimpossible de continuer\n" + + diff -c /dev/null gopher+/gopher/locales/Makefile:1.5 *** /dev/null Fri May 27 00:08:53 1994 --- gopher+/gopher/locales/Makefile Fri May 27 00:08:53 1994 *************** *** 0 **** --- 1,43 ---- + .SUFFIXES: + .SUFFIXES: .cat .msg $(SUFFIXES) + + include ../../Makefile.config + + LOCALES = Es.cat En_US.cat Fr.cat + + # OSF systems + #LOCALEDIR = /usr/lib/nls + + LOCALEDIR = /usr/lib/locale + + .msg.cat: + rm -f $@ + gencat $@ $< + + all : $(LOCALES) + + clean : + rm -f *.cat *.cat.m *~ + + # + # Since many vendors don't have standard directories for languages + # we must have separate install scripts... + # + + + install_sol2 : + cp Fr.cat $(LOCALEDIR)/fr/LC_MESSAGES/gopher.cat + cp Es.cat $(LOCALEDIR)/es/LC_MESSAGES/gopher.cat + + install_osf : + cp Fr.cat /usr/lib/nls/msg/fr_FR.iso8859-1/gopher.cat + cp Es.cat /usr/lib/nls/msg/es_ES.iso8859-1/gopher.cat + + # + # Hacked install for sites that haven't set up locales correctly + # + + install : + mkdir $(CLIENTLIB)/gophernls + cp Fr.cat $(CLIENTLIB)/gophernls + cp Es.cat $(CLIENTLIB)/gophernls diff -c /dev/null gopher+/gopher/locales/README:1.3 *** /dev/null Fri May 27 00:08:53 1994 --- gopher+/gopher/locales/README Fri May 27 00:08:53 1994 *************** *** 0 **** --- 1,69 ---- + $Id: README,v 1.3 1994/05/26 20:00:44 lindner Exp $ + + How to install and use Internationalized message strings. + --------------------------------------------------------- + + Gopher now uses the catopen/catgets calls to read data from message + catalogs. Installing these can be difficult at times. Here are a few + hints on getting these message files working. + + 1) Make the files into binary catalogs using the 'gencat' utility. If + you type 'make' in this directory they should automatically generate + themselves. + + 2) Now, you need to figure out where to install the files. Different + operating systems have different places to put these files. Some + like /usr/lib/locales/, others /usr/lib/nls, etc. + + Look at the manual page for catopen() or intro in section 5 of your + manual pages for more information. Specifically look for + information on the value of the NLSPATH variable. + + 3) Once you have the files in the correct locations you can use them + by changing your LANG or LC_MESSAGES environment variable. + + i.e + + LANG=fr or + setenv LANG Es + + Note that case is significant. The catopen() routines will most + likely look in the following location for it's cat file in: + + {NLSLIB}/{lang}/LC_MESSAGES/gopher.cat + + NLSLIB is defined as your OS specific languages directory, where + {lang} is the value of the LC_MESSAGES environment variable or the + LANG variable + + Other systems put these files in different locations. + + What to do if it just won't work + -------------------------------- + + On some systems you need to have the right files loaded to do NLS + commands. The call to setlocale() will fail if you don't have the + proper files in the /usr/lib/nls directory. Don't worry though, we + provide a backup for such a circumstance. + + By typing 'make install' you will make a gophernls directory that + contains all of the message catalogs. If the gopher client cannot + find the message catalog the regular way, it will try these backup + files. So, if you wanted to use the spanish gopher, do + + setenv LANG Es + + before running the gopher client. + + + Customizing Gopher for your Particular Locale + --------------------------------------------- + + Basically start with one of the files and convert from it. You might + want to start with the En_US.msg, since this is the list of original + english messages. + + Then give it a name (use your iso language code) and send it to the + gopher team for the next release. + + Thanks! diff -c /dev/null gopher+/gopher/vmsopts/tcpware_decc.opt:1.1 *** /dev/null Fri May 27 00:08:54 1994 --- gopher+/gopher/vmsopts/tcpware_decc.opt Fri May 27 00:08:54 1994 *************** *** 0 **** --- 1,2 ---- + tcpware:ucx$ipc_shr.exe/share + sys$share:vaxcrtl/lib diff -c /dev/null gopher+/gopher/vmsopts/tcpware_vaxc.opt:1.1 *** /dev/null Fri May 27 00:08:54 1994 --- gopher+/gopher/vmsopts/tcpware_vaxc.opt Fri May 27 00:08:55 1994 *************** *** 0 **** --- 1,2 ---- + tcpware:ucx$ipc/lib + sys$share:vaxcrtl.exe/share diff -c gopher+/gopherd/Waisindex.c:3.17 gopher+/gopherd/Waisindex.c:3.19 *** gopher+/gopherd/Waisindex.c:3.17 Fri May 27 00:08:56 1994 --- gopher+/gopherd/Waisindex.c Fri May 27 00:08:56 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.17 $ ! * $Date: 1994/04/19 21:50:20 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/Waisindex.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.19 $ ! * $Date: 1994/05/11 02:46:51 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/Waisindex.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: Waisindex.c,v $ + * Revision 3.19 1994/05/11 02:46:51 lindner + * Add #define for older WAIS libraries + * + * Revision 3.18 1994/04/25 20:49:02 lindner + * Fix for debug code + * * Revision 3.17 1994/04/19 21:50:20 lindner * Put back pseudo veronica Wais item, fix for number of arguments * *************** *** 86,91 **** --- 92,104 ---- #if defined(WAISSEARCH) + /** Define this if you are using an older version of Wais **/ + + #ifdef NO_FREEWAIS + FILE *logfile = NULL; + char *log_file_name = NULL; + #endif + int ShowDate = 0; #define _search_c *************** *** 279,285 **** hit best_hit; finished_search_word(db); ! Debug("WaisIndexQuery:After finished_search\n",0); uchdir(Data_Dir); /* necessary to find side files */ --- 292,298 ---- hit best_hit; finished_search_word(db); ! Debugmsg("WaisIndexQuery:After finished_search\n"); uchdir(Data_Dir); /* necessary to find side files */ diff -c gopher+/gopherd/command.c:3.15 gopher+/gopherd/command.c:3.16 *** gopher+/gopherd/command.c:3.15 Fri May 27 00:08:56 1994 --- gopher+/gopherd/command.c Fri May 27 00:08:56 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.15 $ ! * $Date: 1994/04/08 21:08:34 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/command.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/04/25 20:49:03 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/command.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: command.c,v $ + * Revision 3.16 1994/04/25 20:49:03 lindner + * Fix for debug code + * * Revision 3.15 1994/04/08 21:08:34 lindner * Gcc -Wall fix * *************** *** 202,208 **** if (CMDgetCommand(cmd) != NULL && *CMDgetCommand(cmd) != '\0') CMDsetGplus(cmd, TRUE); ! Debug("Command:: ",0); Debug("selstr %s, ", CMDgetSelstr(cmd)); Debug("command %s, ", CMDgetCommand(cmd)); Debug("search %s, ", CMDgetSearch(cmd)); --- 205,211 ---- if (CMDgetCommand(cmd) != NULL && *CMDgetCommand(cmd) != '\0') CMDsetGplus(cmd, TRUE); ! Debugmsg("Command:: "); Debug("selstr %s, ", CMDgetSelstr(cmd)); Debug("command %s, ", CMDgetCommand(cmd)); Debug("search %s, ", CMDgetSearch(cmd)); diff -c gopher+/gopherd/ext.c:3.13 gopher+/gopherd/ext.c:3.16 *** gopher+/gopherd/ext.c:3.13 Fri May 27 00:08:57 1994 --- gopher+/gopherd/ext.c Fri May 27 00:08:57 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.13 $ ! * $Date: 1994/01/20 06:39:18 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/ext.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/05/02 07:41:11 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/ext.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: ext.c,v $ + * Revision 3.16 1994/05/02 07:41:11 lindner + * Mods to use setlocale() + * + * Revision 3.15 1994/04/26 22:43:57 lindner + * Fix for Debugmsg + * + * Revision 3.14 1994/04/25 20:49:04 lindner + * Fix for debug code + * * Revision 3.13 1994/01/20 06:39:18 lindner * When trying to match an extension to a file type, the server prefers * exact matches of type & language, but will now fall back to matching *************** *** 76,81 **** --- 85,91 ---- #include <stdio.h> #include "ext.h" #include "Malloc.h" + #include <locale.h> #include <ctype.h> #include "util.h" #include "serverutil.h" *************** *** 265,271 **** int i, extlen; Extobj *temp; ! Debug("EXAsearch:\r\n",NULL) extlen = strlen(fileext); /*** Linear search. Ick. ***/ --- 275,281 ---- int i, extlen; Extobj *temp; ! Debugmsg("EXAsearch:\r\n"); extlen = strlen(fileext); /*** Linear search. Ick. ***/ *************** *** 314,320 **** int i, extlen; Extobj *temp; ! Debug("EXAsearch:\r\n",NULL) extlen = strlen(fileext); /*** Linear search. Ick. ***/ --- 324,330 ---- int i, extlen; Extobj *temp; ! Debugmsg("EXAsearch:\r\n"); extlen = strlen(fileext); /*** Linear search. Ick. ***/ diff -c gopher+/gopherd/ftp.c:3.32 gopher+/gopherd/ftp.c:3.35 *** gopher+/gopherd/ftp.c:3.32 Fri May 27 00:08:57 1994 --- gopher+/gopherd/ftp.c Fri May 27 00:08:57 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.32 $ ! * $Date: 1994/04/07 17:27:59 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/ftp.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.35 $ ! * $Date: 1994/05/24 06:52:30 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/ftp.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: ftp.c,v $ + * Revision 3.35 1994/05/24 06:52:30 lindner + * Fix for spinning ftp processes from R.S. Jones + * + * Revision 3.34 1994/05/18 04:28:21 lindner + * Fixes for ftp from Jonzy + * + * Revision 3.33 1994/04/25 20:49:05 lindner + * Fix for debug code + * * Revision 3.32 1994/04/07 17:27:59 lindner * Recognize more Unix ftp sites as Unix * *************** *** 180,186 **** /** Global socket value **/ ! static int Gsockfd; boolean GETDIR = FALSE; --- 189,195 ---- /** Global socket value **/ ! static int Gsockfd = -1; boolean GETDIR = FALSE; *************** *** 199,205 **** FTP *temp; if (host == NULL || *host == '\0') { ! Debug("FTPnew, bad param..\n",NULL); return(NULL); } --- 208,214 ---- FTP *temp; if (host == NULL || *host == '\0') { ! Debugmsg("FTPnew, bad param..\n"); return(NULL); } *************** *** 327,333 **** ftpnum = FTPgetReply(ftp, 999, message, sizeof(message)); if (ftpnum == 215) { ! Debug("Analyzing ftp syst output\n", NULL); if (strncmp(message+4, "MTS", 3) == 0 || strncmp(message+4, "VMS", 3) == 0) { FTPsetType(ftp, FTP_VMS); --- 336,342 ---- ftpnum = FTPgetReply(ftp, 999, message, sizeof(message)); if (ftpnum == 215) { ! Debugmsg("Analyzing ftp syst output\n"); if (strncmp(message+4, "MTS", 3) == 0 || strncmp(message+4, "VMS", 3) == 0) { FTPsetType(ftp, FTP_VMS); *************** *** 406,425 **** if (ftpnum > errorlevel) { /*** Had an error ***/ FTPerrorMessage(ftp, message); ! while (FTPisContinuation(ftp, message)) { ftpnum = FTPgetReplyline(ftp, message, maxlen); FTPerrorMessage(ftp, message); } FTPabort(ftp); gopherd_exit(-1); } while (FTPisContinuation(ftp, message)) { ! FTPinfoMessage(ftp, message); ftpnum = FTPgetReplyline(ftp, message, maxlen); } return(ftpnum); } --- 415,445 ---- if (ftpnum > errorlevel) { /*** Had an error ***/ FTPerrorMessage(ftp, message); ! LOGGopher(-1, message); while (FTPisContinuation(ftp, message)) { ftpnum = FTPgetReplyline(ftp, message, maxlen); + if (ftpnum == -1) { + /** Abnormal condition **/ + FTPabort(ftp); + gopherd_exit(); + } FTPerrorMessage(ftp, message); } FTPabort(ftp); gopherd_exit(-1); + } else if (ftpnum <0) { + /** Really bad error **/ + FTPabort(ftp); + gopherd_exit(-1); } while (FTPisContinuation(ftp, message)) { ! /*FTPinfoMessage(ftp, message);*/ ftpnum = FTPgetReplyline(ftp, message, maxlen); + if (ftpnum == -1) + break; } return(ftpnum); } *************** *** 437,447 **** { int ftpnum, i; i = readline(FTPgetControl(ftp), message, maxlen); Debug("<-- %s\n",message); ! if (i < 0) return(-1); ftpnum = FTPfindNum(ftp, message); --- 457,470 ---- { int ftpnum, i; + for (i=0; i<maxlen; i++) + message[i] = '\n'; + i = readline(FTPgetControl(ftp), message, maxlen); Debug("<-- %s\n",message); ! if (i <= 0) return(-1); ftpnum = FTPfindNum(ftp, message); *************** *** 699,707 **** { char errmsg[256]; ! sprintf(errmsg, "3%s\t\terror.host\t1\r\n", message); ! writestring(Gsockfd, errmsg); } void --- 722,734 ---- { char errmsg[256]; ! if (message == NULL) ! return; ! ZapCRLF(message); + sprintf(errmsg, "0%s\t\terror.host\t1\r\n", message); + + writestring(Gsockfd, errmsg); } void *************** *** 752,757 **** --- 779,786 ---- char buf[8192]; int blen; char lastchar; + + Gsockfd = sockfd; /* Find @ and parse out */ cp = strchr(ftpstr, '@'); *************** *** 955,967 **** case FTP_UNIX: case FTP_WINNT: ! Debug("Parsing Unix List\n", NULL); Gzerotype = ParseUnixList(ftp, bufptr, IntName, theName, 8); break; case FTP_UNKNOWN: default: ! Debug("Parsing Unknown List\n", NULL); Gzerotype = ParseUnixList(ftp, bufptr, IntName, theName, 7); break; } --- 984,996 ---- case FTP_UNIX: case FTP_WINNT: ! Debugmsg("Parsing Unix List\n"); Gzerotype = ParseUnixList(ftp, bufptr, IntName, theName, 8); break; case FTP_UNKNOWN: default: ! Debugmsg("Parsing Unknown List\n"); Gzerotype = ParseUnixList(ftp, bufptr, IntName, theName, 7); break; } diff -c gopher+/gopherd/gopherd.c:3.88 gopher+/gopherd/gopherd.c:3.92 *** gopher+/gopherd/gopherd.c:3.88 Fri May 27 00:08:59 1994 --- gopher+/gopherd/gopherd.c Fri May 27 00:08:59 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.88 $ ! * $Date: 1994/04/21 21:24:21 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/gopherd.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.92 $ ! * $Date: 1994/05/18 04:00:40 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/gopherd.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,32 ---- ********************************************************************* * Revision History: * $Log: gopherd.c,v $ + * Revision 3.92 1994/05/18 04:00:40 lindner + * Add port# to waiting for connection message + * + * Revision 3.91 1994/05/14 04:19:33 lindner + * Fix for text files with really long lines + * + * Revision 3.90 1994/05/02 07:41:12 lindner + * Mods to use setlocale() + * + * Revision 3.89 1994/04/25 20:49:07 lindner + * Fix for debug code + * * Revision 3.88 1994/04/21 21:24:21 lindner * FIOclose fix * *************** *** 450,455 **** --- 462,469 ---- int errflag =0; + setlocale(LC_ALL, ""); + Argv = argv; #if !(defined(NeXT) || defined(_AIX)) *************** *** 676,682 **** /** Set our cmd string **/ ! ServerSetArgv("waiting for connection"); /** Clean up the pid directory before using it... **/ PIDclean(GDCgetPiddir(Config)); --- 690,696 ---- /** Set our cmd string **/ ! ServerSetArgv("waiting for connection @ %d", GopherPort); /** Clean up the pid directory before using it... **/ PIDclean(GDCgetPiddir(Config)); *************** *** 774,780 **** if (strcmp(Zeline, "\n") ==0 && (!flagged)) { flagged = 1; strcpy(Title, NO_SUBJECT); ! Debug("No subject found - using default\n",0); } if (is_mail_from_line(Zeline)==0) { --- 788,794 ---- if (strcmp(Zeline, "\n") ==0 && (!flagged)) { flagged = 1; strcpy(Title, NO_SUBJECT); ! Debugmsg("No subject found - using default\n"); } if (is_mail_from_line(Zeline)==0) { *************** *** 2514,2519 **** --- 2528,2534 ---- GSsendHeader(sockfd, -1); while (fgets(inputline, sizeof(inputline), ZeFile) != NULL) { + ZapCRLF(inputline); /** Period on a line by itself, double it.. **/ *************** *** 2522,2528 **** inputline[2] = '\0'; } ! strcat(inputline, "\r\n"); len = strlen(inputline); if (((bufptr-writebuf) + len+1) > 4096) { --- 2537,2545 ---- inputline[2] = '\0'; } ! if (strlen(inputline) < 512) ! strcat(inputline, "\r\n"); ! len = strlen(inputline); if (((bufptr-writebuf) + len+1) > 4096) { diff -c gopher+/gopherd/gopherd.conf:3.18 gopher+/gopherd/gopherd.conf:3.20 *** gopher+/gopherd/gopherd.conf:3.18 Fri May 27 00:09:00 1994 --- gopher+/gopherd/gopherd.conf Fri May 27 00:09:00 1994 *************** *** 1,5 **** # ! # $Id: gopherd.conf,v 3.18 1994/04/13 04:27:06 lindner Exp $ # # --- 1,5 ---- # ! # $Id: gopherd.conf,v 3.20 1994/05/25 20:58:12 lindner Exp $ # # *************** *** 6,41 **** # An example gopherd.conf file # # - # Hostalias line, - # # format is: # # "hostalias: <hostname alias>" #hostalias: gopher.turnip.com # ! # Cachetime line # - # Format is "cachetime: <time in seconds>" - # Cachetime: 180 ! # # Administrator line, # # format is: ! # "Admin:" <any text thing, usually a name/phone fax,etc> # ! # "AdminEmail:" <RFC-822 Email address> Admin: Studly Gopher Admin +1 (612) 338-3970 AdminEmail: gopher@turnip.com # - # Site - # #Site: the name of the site #Org: organization or group owning the site #Loc: city, state, country --- 6,42 ---- # An example gopherd.conf file # + #--------------------------------------------------------------------- + # The 'Canonical' name for this gopher server, if different from the hostname # # format is: # # "hostalias: <hostname alias>" #hostalias: gopher.turnip.com + #--------------------------------------------------------------------- + # How long do we honor .cache and .cache+ files for directories? # ! # Format is ! # cachetime: <time in seconds> # Cachetime: 180 ! #--------------------------------------------------------------------- # Administrator line, # # format is: ! # Admin: <any text thing, usually a name/phone fax,etc> # ! # AdminEmail: <RFC-822 Email address> Admin: Studly Gopher Admin +1 (612) 338-3970 AdminEmail: gopher@turnip.com + #--------------------------------------------------------------------- + # Descriptive information about this Gopher site # #Site: the name of the site #Org: organization or group owning the site #Loc: city, state, country *************** *** 49,54 **** --- 50,61 ---- Geog: 44 58 48 N 93 15 49 W Language: En_US + + #--------------------------------------------------------------------- + # File decoders. Run the given program on the file with the specific + # extension. + # + decoder: .Z /usr/ucb/zcat decoder: .gz /usr/gnu/bin/zcat #decoder: .adpcm /usr/openwin/bin/adpcm_dec *************** *** 55,74 **** #decoder: .z /usr/gnu/bin/zcat ! # # Pid directory.. This is a scratch directory for concurrent session load # limiting.. Needs to be inside your gopher-data directory if running ! # chrooted # #PIDS_Directory: /pids ! #TZ: -6 ! # # Map filename extensions to gopher-types # # Format is ! # "viewext: <extension> <gophertype> <pfx> <gopher+type> [ISO langauge] # # Different Languages --- 62,80 ---- #decoder: .z /usr/gnu/bin/zcat ! #--------------------------------------------------------------------- # Pid directory.. This is a scratch directory for concurrent session load # limiting.. Needs to be inside your gopher-data directory if running ! # chrooted. This stuff is very beta right now. # #PIDS_Directory: /pids ! #--------------------------------------------------------------------- # Map filename extensions to gopher-types # # Format is ! # viewext: <extension> <gophertype> <pfx> <gopher+type> [ISO langauge] # # Different Languages *************** *** 84,90 **** # Graphics file formats - viewext: .gif I 9 image/gif viewext: .jpg I 9 image/JPEG viewext: .tif I 9 image/tiff --- 90,95 ---- *************** *** 91,103 **** # Sounds - viewext: .au s s audio/basic viewext: .snd s s audio/basic viewext: .wav s s audio/microsoft-wave # Movies - viewext: .mov ; 9 video/quicktime viewext: .mpg ; 9 video/mpeg --- 96,107 ---- # Sounds viewext: .au s s audio/basic viewext: .snd s s audio/basic viewext: .wav s s audio/microsoft-wave + viewext: .mod s s audio/soundtracker # Movies viewext: .mov ; 9 video/quicktime viewext: .mpg ; 9 video/mpeg *************** *** 107,125 **** viewext: .zip 5 9 application/zip viewext: .arj 5 9 application/x-arj ! viewext: .zoo 5 9 application/octet-stream ! viewext: .arc 5 9 application/octet-stream ! viewext: .lzh 5 9 application/octet-stream ! viewext: .lha 5 9 application/octet-stream ! viewext: .dms 5 9 application/octet-stream ! viewext: .tar.Z 9 9 application/octet-stream ! viewext: .tar 9 9 application/octet-stream ! viewext: .exe 5 9 application/octet-stream ! viewext: .bck 9 9 application/octet-stream ! viewext: .sav 9 9 application/octet-stream ! viewext: .ps 0 0 application/postscript viewext: .tex 0 0 application/x-tex viewext: .dvi 0 9 application/x-dvi viewext: .troff 0 0 Text/x-troff --- 111,129 ---- viewext: .zip 5 9 application/zip viewext: .arj 5 9 application/x-arj ! viewext: .zoo 5 9 application/x-zoo ! viewext: .arc 5 9 application/x-arc ! viewext: .lzh 5 9 application/x-lzh ! viewext: .lha 5 9 application/x-lha ! viewext: .dms 5 9 application/x-dms ! viewext: .tar.Z 9 9 application/x-tarZ ! viewext: .tar 9 9 application/x-tar ! viewext: .exe 5 9 application/x-pcexe ! viewext: .bck 9 9 application/x-bck ! viewext: .sav 9 9 application/x-saveset ! viewext: .ps 0 9 application/postscript viewext: .tex 0 0 application/x-tex viewext: .dvi 0 9 application/x-dvi viewext: .troff 0 0 Text/x-troff *************** *** 144,151 **** # # These are for the experimental gview # ! viewext: .gview 1 1 Directory+/gview ! blockext: .spot GVIEWSPOT # # Map files to certain blocks --- 148,155 ---- # # These are for the experimental gview # ! #viewext: .gview 1 1 Directory+/gview ! #blockext: .spot GVIEWSPOT # # Map files to certain blocks diff -c gopher+/gopherd/gopherd.h:3.7 gopher+/gopherd/gopherd.h:3.9 *** gopher+/gopherd/gopherd.h:3.7 Fri May 27 00:09:00 1994 --- gopher+/gopherd/gopherd.h Fri May 27 00:09:00 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.7 $ ! * $Date: 1994/04/14 18:00:38 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/gopherd.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.9 $ ! * $Date: 1994/05/14 04:19:15 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/gopherd.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: gopherd.h,v $ + * Revision 3.9 1994/05/14 04:19:15 lindner + * Use new locale.h + * + * Revision 3.8 1994/05/02 07:41:14 lindner + * Mods to use setlocale() + * * Revision 3.7 1994/04/14 18:00:38 lindner * Fix for AIX * *************** *** 45,50 **** --- 51,57 ---- #include "conf.h" + #include <Locale.h> #include <ctype.h> #include <stdio.h> diff -c gopher+/gopherd/index.c:3.18 gopher+/gopherd/index.c:3.20 *** gopher+/gopherd/index.c:3.18 Fri May 27 00:09:01 1994 --- gopher+/gopherd/index.c Fri May 27 00:09:01 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.18 $ ! * $Date: 1994/04/08 21:08:07 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/index.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.20 $ ! * $Date: 1994/05/14 04:18:14 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/index.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: index.c,v $ + * Revision 3.20 1994/05/14 04:18:14 lindner + * Fix weird prob... + * + * Revision 3.19 1994/04/27 19:22:20 lindner + * compatible.h added + * * Revision 3.18 1994/04/08 21:08:07 lindner * Fix a bug in the Shell Search code * *************** *** 82,89 **** --- 88,97 ---- * *********************************************************************/ + #include "compatible.h" #include "gopherd.h" #include "command.h" + #include "fileio.h" #include "Debug.h" #include <stdio.h> diff -c gopher+/gopherd/kernutils.c:3.7 gopher+/gopherd/kernutils.c:3.8 *** gopher+/gopherd/kernutils.c:3.7 Fri May 27 00:09:01 1994 --- gopher+/gopherd/kernutils.c Fri May 27 00:09:01 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.7 $ ! * $Date: 1994/03/17 04:11:23 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/kernutils.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.8 $ ! * $Date: 1994/04/25 20:49:09 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/kernutils.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: kernutils.c,v $ + * Revision 3.8 1994/04/25 20:49:09 lindner + * Fix for debug code + * * Revision 3.7 1994/03/17 04:11:23 lindner * VMS update * *************** *** 81,87 **** status = getload(); if (status == -1) ! Debug("Error getting Load information!!\n",0); ; Debug("getload returns %d\n",status); return(status); --- 84,90 ---- status = getload(); if (status == -1) ! Debugmsg("Error getting Load information!!\n"); ; Debug("getload returns %d\n",status); return(status); *************** *** 117,123 **** return(0); } if (fread((char *)&_averages,sizeof(_averages),1,lav)==0) { ! Debug("Cannot access load averages...",0); fclose(lav); return(0); } --- 120,126 ---- return(0); } if (fread((char *)&_averages,sizeof(_averages),1,lav)==0) { ! Debugmsg("Cannot access load averages..."); fclose(lav); return(0); } diff -c gopher+/gopherd/mindexd.c:3.14 gopher+/gopherd/mindexd.c:3.15 *** gopher+/gopherd/mindexd.c:3.14 Fri May 27 00:09:01 1994 --- gopher+/gopherd/mindexd.c Fri May 27 00:09:01 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.14 $ ! * $Date: 1994/03/31 22:44:33 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/mindexd.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.15 $ ! * $Date: 1994/05/05 03:00:37 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/mindexd.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: mindexd.c,v $ + * Revision 3.15 1994/05/05 03:00:37 lindner + * Fix for mindex file processing.. + * * Revision 3.14 1994/03/31 22:44:33 lindner * don't mess with the selector string in mindexd * *************** *** 97,103 **** char line[1024]; /* line buffer for reading config */ char *linep; /* pointer to 'line' */ ! strncpy(line, the_filename, sizeof(the_filename)); local = line; if ((fp = rfopen(local, "r")) == NULL) { --- 100,106 ---- char line[1024]; /* line buffer for reading config */ char *linep; /* pointer to 'line' */ ! strcpy(line, the_filename); local = line; if ((fp = rfopen(local, "r")) == NULL) { diff -c gopher+/gopherd/pid.c:3.4 gopher+/gopherd/pid.c:3.5 *** gopher+/gopherd/pid.c:3.4 Fri May 27 00:09:02 1994 --- gopher+/gopherd/pid.c Fri May 27 00:09:02 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.4 $ ! * $Date: 1994/04/08 21:03:37 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/pid.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1994/05/25 20:58:27 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/pid.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: pid.c,v $ + * Revision 3.5 1994/05/25 20:58:27 lindner + * remove unused variable + * * Revision 3.4 1994/04/08 21:03:37 lindner * Fix typo... * *************** *** 179,185 **** PIDclean(piddirstr) char *piddirstr; { - int count = 0; DIR *pids; struct dirent *dp; int pidnum; --- 182,187 ---- diff -c gopher+/gopherd/site.c:3.5 gopher+/gopherd/site.c:3.6 *** gopher+/gopherd/site.c:3.5 Fri May 27 00:09:02 1994 --- gopher+/gopherd/site.c Fri May 27 00:09:02 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1994/03/17 21:18:24 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/site.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.6 $ ! * $Date: 1994/05/02 07:41:15 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/site.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: site.c,v $ + * Revision 3.6 1994/05/02 07:41:15 lindner + * Mods to use setlocale() + * * Revision 3.5 1994/03/17 21:18:24 lindner * Massive reworking of access limits * *************** *** 41,46 **** --- 44,50 ---- #include "site.h" #include "Malloc.h" + #include <locale.h> #include <ctype.h> #include "util.h" #include "Debug.h" diff -c gopher+/gopherd/special.c:3.16 gopher+/gopherd/special.c:3.17 *** gopher+/gopherd/special.c:3.16 Fri May 27 00:09:03 1994 --- gopher+/gopherd/special.c Fri May 27 00:09:03 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/04/14 15:48:54 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/special.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.17 $ ! * $Date: 1994/04/25 20:49:11 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/special.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: special.c,v $ + * Revision 3.17 1994/04/25 20:49:11 lindner + * Fix for debug code + * * Revision 3.16 1994/04/14 15:48:54 lindner * Fix for files with single quotes * *************** *** 185,191 **** ispipe = 1; ! Debug("Zcat/popen is okay\n",0); return pp; --- 188,194 ---- ispipe = 1; ! Debugmsg("Zcat/popen is okay\n"); return pp; diff -c gopher+/gopherd/wais.h:3.1.1.1 gopher+/gopherd/wais.h:3.3 *** gopher+/gopherd/wais.h:3.1.1.1 Fri May 27 00:09:03 1994 --- gopher+/gopherd/wais.h Fri May 27 00:09:03 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.1.1.1 $ ! * $Date: 1993/02/11 18:02:53 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/wais.h,v $ * $Status: $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.3 $ ! * $Date: 1994/05/14 04:18:43 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/wais.h,v $ * $Status: $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: wais.h,v $ + * Revision 3.3 1994/05/14 04:18:43 lindner + * Use new locale.h + * + * Revision 3.2 1994/05/02 07:41:16 lindner + * Mods to use setlocale() + * * Revision 3.1.1.1 1993/02/11 18:02:53 lindner * Gopher+1.2beta release * *************** *** 37,42 **** --- 43,54 ---- jonathan@Think.COM * $Log: wais.h,v $ + * Revision 3.3 1994/05/14 04:18:43 lindner + * Use new locale.h + * + * Revision 3.2 1994/05/02 07:41:16 lindner + * Mods to use setlocale() + * * Revision 3.1.1.1 1993/02/11 18:02:53 lindner * Gopher+1.2beta release * *************** *** 55,60 **** --- 67,73 ---- #define STRINGSIZE 256 + #include <Locale.h> #include <ctype.h> #include <sys/types.h> #include <sys/stat.h> diff -c gopher+/gopherd/waisgopher.c:3.21 gopher+/gopherd/waisgopher.c:3.23 *** gopher+/gopherd/waisgopher.c:3.21 Fri May 27 00:09:03 1994 --- gopher+/gopherd/waisgopher.c Fri May 27 00:09:03 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.21 $ ! * $Date: 1994/03/17 21:14:19 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/waisgopher.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.23 $ ! * $Date: 1994/05/02 07:41:17 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/gopherd/waisgopher.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: waisgopher.c,v $ + * Revision 3.23 1994/05/02 07:41:17 lindner + * Mods to use setlocale() + * + * Revision 3.22 1994/04/25 20:49:12 lindner + * Fix for debug code + * * Revision 3.21 1994/03/17 21:14:19 lindner * Fix for pid load limiting * *************** *** 111,116 **** --- 117,123 ---- #define ANSI_LIKE #endif + #include <locale.h> #include <ctype.h> #include <ui.h> #include <docid.h> *************** *** 255,261 **** if ('\n' == record->DocumentText->bytes[count + 1]) break; case '\n': ! Debug("Got a return\n",0); output[outputptr++] = '\r'; output[outputptr++] = '\n'; break; --- 262,268 ---- if ('\n' == record->DocumentText->bytes[count + 1]) break; case '\n': ! Debugmsg("Got a return\n"); output[outputptr++] = '\r'; output[outputptr++] = '\n'; break; *************** *** 897,903 **** if (strncmp(type, "TEXT", 4) == 0) { int k; k = 0; ! Debug("Displaying text\n",0); while (((WAISSearchResponse *)retrieval_response->DatabaseDiagnosticRecords)->Text[k] != 0) { Mydisplay_text_record_completely (((WAISSearchResponse *)retrieval_response->DatabaseDiagnosticRecords)->Text[k++], false, sockfd); --- 904,910 ---- if (strncmp(type, "TEXT", 4) == 0) { int k; k = 0; ! Debugmsg("Displaying text\n"); while (((WAISSearchResponse *)retrieval_response->DatabaseDiagnosticRecords)->Text[k] != 0) { Mydisplay_text_record_completely (((WAISSearchResponse *)retrieval_response->DatabaseDiagnosticRecords)->Text[k++], false, sockfd); *************** *** 911,917 **** Source Moo; /*** It's a search! **/ ! Debug("Searching!\n",0); /*** Dump out the contents of the text record on the server ***/ /*** then call SearchRemoteWAIS(), then delete file ***/ --- 918,924 ---- Source Moo; /*** It's a search! **/ ! Debugmsg("Searching!\n"); /*** Dump out the contents of the text record on the server ***/ /*** then call SearchRemoteWAIS(), then delete file ***/ *************** *** 943,949 **** else { int recs =0; ! Debug("Displaying Binary\n",0); while (1) { if (((WAISSearchResponse*)retrieval_response->DatabaseDiagnosticRecords)->Text[recs] == NULL) break; --- 950,956 ---- else { int recs =0; ! Debugmsg("Displaying Binary\n"); while (1) { if (((WAISSearchResponse*)retrieval_response->DatabaseDiagnosticRecords)->Text[recs] == NULL) break; diff -c gopher+/object/Debug.h:3.1 gopher+/object/Debug.h:3.3 *** gopher+/object/Debug.h:3.1 Fri May 27 00:09:05 1994 --- gopher+/object/Debug.h Fri May 27 00:09:05 1994 *************** *** 8,18 **** --- 8,20 ---- #ifdef DEBUGGING # include <stdio.h> # define Debug(str,val) if (DEBUG) { fprintf(stderr,str,val); } + # define Debugmsg(str) if (DEBUG) { fprintf(stderr,str); } # define DebugGSplusPrint(gop,str) if (DEBUG) { GSplusPrint(gop,str); } #else # define Debug(str,val) + # define Debugmsg(str) # define DebugGSplusPrint(gop,str) #endif diff -c gopher+/object/GDgopherdir.c:3.20 gopher+/object/GDgopherdir.c:3.22 *** gopher+/object/GDgopherdir.c:3.20 Fri May 27 00:09:05 1994 --- gopher+/object/GDgopherdir.c Fri May 27 00:09:05 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.20 $ ! * $Date: 1994/04/21 21:24:57 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/GDgopherdir.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.22 $ ! * $Date: 1994/04/27 19:21:37 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/GDgopherdir.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: GDgopherdir.c,v $ + * Revision 3.22 1994/04/27 19:21:37 lindner + * Fix for semicolons after Debugmsg + * + * Revision 3.21 1994/04/25 03:36:56 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.20 1994/04/21 21:24:57 lindner * Fix fcn header * *************** *** 244,250 **** GSformat fmt; { int i; ! Debug("GDplustoNet\n",0); if (fmt == GSFORM_HTML) { writestring(sockfd, "<DL COMPACT>\r\n"); --- 250,256 ---- GSformat fmt; { int i; ! Debugmsg("GDplustoNet\n"); if (fmt == GSFORM_HTML) { writestring(sockfd, "<DL COMPACT>\r\n"); *************** *** 290,296 **** int j, result; char inputline[256]; ! Debug("GDplusfromNet:: start\r\n",0) if (TempGopher == NULL) TempGopher = GSnew(); --- 296,302 ---- int j, result; char inputline[256]; ! Debugmsg("GDplusfromNet:: start\r\n"); if (TempGopher == NULL) TempGopher = GSnew(); *************** *** 307,313 **** else if (*inputline != '+') return(0); ! Debug("after readrecvbuf",0) /** State _FirstPlus_ **/ result = readtoken(fd, inputline, sizeof(inputline), ':'); --- 313,319 ---- else if (*inputline != '+') return(0); ! Debugmsg("after readrecvbuf"); /** State _FirstPlus_ **/ result = readtoken(fd, inputline, sizeof(inputline), ':'); *************** *** 314,324 **** if (result <=0) return(result); ! Debug("after readtoken",0) if (strcmp(inputline, "INFO")!=0) { return(0); } ! Debug("after INFO",0) /** Read the space **/ readrecvbuf(fd, inputline, 1); --- 320,330 ---- if (result <=0) return(result); ! Debugmsg("after readtoken"); if (strcmp(inputline, "INFO")!=0) { return(0); } ! Debugmsg("after INFO"); /** Read the space **/ readrecvbuf(fd, inputline, 1); *************** *** 327,333 **** for (j=0; ; j++) { ! Debug("for start",0); ZesTmp[0] = '\0'; GSinit(TempGopher); --- 333,339 ---- for (j=0; ; j++) { ! Debugmsg("for start"); ZesTmp[0] = '\0'; GSinit(TempGopher); *************** *** 376,382 **** static char ZesTmp[1024]; int i; ! Debug("GDfromNet...",0); if (TempGopher == NULL) TempGopher = GSnew(); --- 382,388 ---- static char ZesTmp[1024]; int i; ! Debugmsg("GDfromNet..."); if (TempGopher == NULL) TempGopher = GSnew(); *************** *** 498,508 **** cp = GSgetPath(gs); if (len >1 && strcmp(text+1, cp+1) == 0) { ! Debug("Matched\n",0); return(i); } } ! Debug("GDsearch: No Match\n",0); return(-1); } --- 504,514 ---- cp = GSgetPath(gs); if (len >1 && strcmp(text+1, cp+1) == 0) { ! Debugmsg("Matched\n"); return(i); } } ! Debugmsg("GDsearch: No Match\n"); return(-1); } diff -c gopher+/object/GSgopherobj.c:3.46 gopher+/object/GSgopherobj.c:3.51 *** gopher+/object/GSgopherobj.c:3.46 Fri May 27 00:09:06 1994 --- gopher+/object/GSgopherobj.c Fri May 27 00:09:06 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.46 $ ! * $Date: 1994/04/22 06:41:35 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/GSgopherobj.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.51 $ ! * $Date: 1994/05/25 20:57:46 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/GSgopherobj.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,35 ---- ********************************************************************* * Revision History: * $Log: GSgopherobj.c,v $ + * Revision 3.51 1994/05/25 20:57:46 lindner + * Remove unused var + * + * Revision 3.50 1994/05/06 02:29:46 lindner + * Fix from Robert Beckett for binhex files + * + * Revision 3.49 1994/04/25 03:36:58 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * + * Revision 3.48 1994/04/25 02:26:30 lindner + * Fix for url problems + * + * Revision 3.47 1994/04/25 02:16:31 lindner + * Fix for |= mistype + * * Revision 3.46 1994/04/22 06:41:35 lindner * More pacbell hacks for Domain= * *************** *** 457,468 **** } char * ! GStoNetURL(gs) GopherObj *gs; { ! char u[256], *path, *ftphost, *ftppath; ! *u = '\0'; path = GSgetPath(gs); /** This is a server specific hack for now.. **/ --- 472,484 ---- } char * ! GStoNetURL(gs,url) GopherObj *gs; + char *url; { ! char *path, *ftphost, *ftppath; ! *url = '\0'; path = GSgetPath(gs); /** This is a server specific hack for now.. **/ *************** *** 473,479 **** if (ftppath != NULL) { ! sprintf(u, "ftp://%.*s/", ftppath-ftphost, ftphost); ftppath++; --- 489,495 ---- if (ftppath != NULL) { ! sprintf(url, "ftp://%.*s/", ftppath-ftphost, ftphost); ftppath++; *************** *** 481,488 **** if (*ftppath == '/') ftppath++; ! strcat(u, ftppath); ! return(u); } } return(GSgetURLhtml(gs)); --- 497,504 ---- if (*ftppath == '/') ftppath++; ! strcat(url, ftppath); ! return(url); } } return(GSgetURLhtml(gs)); *************** *** 651,657 **** GSformat fmt; { static char buf[1024]; ! char *cp; buf[0] = GSgetType(gs); --- 667,673 ---- GSformat fmt; { static char buf[1024]; ! char cp[256]; buf[0] = GSgetType(gs); *************** *** 684,694 **** writestring(sockfd, GSgetTitle(gs)); return; } ! cp = GStoNetURL(gs); if ( (cp == NULL) || (*cp == '\0') ) return; sprintf(buf, "<DT><A HREF=\"%s\">%s</A>\r\n", cp, GSgetTitle(gs)); writestring(sockfd, buf); if (GSgplusInited(gs)) { --- 700,711 ---- writestring(sockfd, GSgetTitle(gs)); return; } ! GStoNetURL(gs, cp); if ( (cp == NULL) || (*cp == '\0') ) return; sprintf(buf, "<DT><A HREF=\"%s\">%s</A>\r\n", cp, GSgetTitle(gs)); + free(cp); writestring(sockfd, buf); if (GSgplusInited(gs)) { *************** *** 1287,1293 **** { char headerline[128]; ! Debug("GSrecvHeader\n",0); if (GSisGplus(gs)) { readline(sockfd, headerline, sizeof(headerline)); ZapCRLF(headerline); --- 1304,1310 ---- { char headerline[128]; ! Debugmsg("GSrecvHeader\n"); if (GSisGplus(gs)) { readline(sockfd, headerline, sizeof(headerline)); ZapCRLF(headerline); *************** *** 1420,1426 **** boolean DidDomain = FALSE; /** Needed to make Domain= lines into logical or's **/ ! Debug("GSfromLink...\n",0); while ((bytesread = FIOreadlinezap(fio, buf, sizeof(buf)))>0) { if (buf[0] == '#') { --- 1437,1443 ---- boolean DidDomain = FALSE; /** Needed to make Domain= lines into logical or's **/ ! Debugmsg("GSfromLink...\n"); while ((bytesread = FIOreadlinezap(fio, buf, sizeof(buf)))>0) { if (buf[0] == '#') { *************** *** 1554,1560 **** break; /*** Unknown name/item ***/ } ! Debug("Done with this link item\n",0); if (BadDomain) return(SOFTERROR); --- 1571,1577 ---- break; /*** Unknown name/item ***/ } ! Debugmsg("Done with this link item\n"); if (BadDomain) return(SOFTERROR); *************** *** 1772,1778 **** } else { GSsetType(gs, A_FILE); } ! doneflags != G_TYPE; } } else { GSsetPath(gs, cp); --- 1789,1795 ---- } else { GSsetType(gs, A_FILE); } ! doneflags |= G_TYPE; } } else { GSsetPath(gs, cp); *************** *** 1828,1848 **** GopherObj *gs; char *view; { - char viewstowage[64], *cp; - if (view == NULL) - return(FALSE); - - strcpy(viewstowage, view); - if ((cp=strchr(viewstowage, ' '))!=NULL) { - *cp = '\0'; - view = viewstowage; - } - if (view == NULL) { switch (GSgetType(gs)) { case A_FILE: case A_MACHEX: return(TRUE); default: --- 1845,1856 ---- GopherObj *gs; char *view; { if (view == NULL) { switch (GSgetType(gs)) { case A_FILE: case A_MACHEX: + case A_HTML: return(TRUE); default: *************** *** 1850,1857 **** } } else { if (strncasecmp(view, "Text",4) == 0 || ! strncasecmp(view, "application/postscript", 21)==0) return(TRUE); else return(FALSE); --- 1858,1877 ---- } } else { + char viewstowage[64], *cp; + + strcpy(viewstowage, view); + if ((cp=strchr(viewstowage, ' '))!=NULL) { + *cp = '\0'; + view = viewstowage; + } + if (strncasecmp(view, "Text",4) == 0 || ! strncasecmp(view, "application/postscript", 21)==0 || ! strncasecmp(view, "application/mac-binhex40", 24)==0 || ! strncasecmp(view, "application/rtf", 15) == 0) ! ! return(TRUE); else return(FALSE); diff -c /dev/null gopher+/object/Locale.h:3.6 *** /dev/null Fri May 27 00:09:07 1994 --- gopher+/object/Locale.h Fri May 27 00:09:07 1994 *************** *** 0 **** --- 1,39 ---- + /* + * These routines make using the international messages facilities easier. + * + * Note if you use this stuff you'll need to add a global variable + * + * nl_catd Gcatd; + * + * to your source. + * + * This interface could be applied to methods other than X/Open coding + * (VMS etc..) + * + * Copyright (c) 1994 University of Minnesota + */ + + #if defined(VMS) || defined(_AUX_SOURCE) /* VMS doesn't have locale.h */ + # define setlocale(a,b) + # define Gtxt(a,b) a + # define Gtxtopen(a,b,c) + #else + # include <locale.h> + + /** Figure out which systems have catopen() etal **/ + + # if defined(__svr4__) || defined(sgi) || defined(_XOPEN_SOURCE) + # include <nl_types.h> + # define GINTERNATIONAL + # endif + + # if !defined(GINTERNATIONAL) /* Only use i18n routines if we're sure */ + # define Gtxtopen(a,b,c) + # define Gtxt(a,b) a + # else + /*** Define some nice convenience routines ***/ + /** It would sure be nice to use gettext() routines... oh well...***/ + # define Gtxt(a,b) (catgets(Gcatd,NL_SETD,b,a)) + # define Gtxtopen(a,b,c) (a=catopen(b,c)) + # endif + #endif diff -c gopher+/object/Malloc.h:3.3 gopher+/object/Malloc.h:3.5 *** gopher+/object/Malloc.h:3.3 Fri May 27 00:09:07 1994 --- gopher+/object/Malloc.h Fri May 27 00:09:07 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.3 $ ! * $Date: 1993/10/19 20:46:35 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/Malloc.h,v $ * $Status: $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.5 $ ! * $Date: 1994/05/24 05:42:17 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/Malloc.h,v $ * $Status: $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: Malloc.h,v $ + * Revision 3.5 1994/05/24 05:42:17 lindner + * Fix for old field version of DECC + * + * Revision 3.4 1994/05/19 14:25:24 lindner + * faster VMS VAXC malloc + * * Revision 3.3 1993/10/19 20:46:35 lindner * use stdio.h in Malloc.h to get NULL if necessary * *************** *** 30,37 **** * *********************************************************************/ - /* * Just enough to get us memory allocation and NULL * --- 36,43 ---- * *********************************************************************/ + #ifndef G_MALLOC_H /* * Just enough to get us memory allocation and NULL * *************** *** 57,59 **** --- 63,79 ---- #ifndef NULL #define NULL ((void*) 0) #endif + + + /* memory management for VAXC */ + + #if defined(VMS) && defined(VAXC) && !defined(__DECC) + # include <stdlib.h> + # define malloc VAXC$MALLOC_OPT + # define calloc VAXC$CALLOC_OPT + # define free VAXC$FREE_OPT + # define cfree VAXC$CFREE_OPT + # define realloc VAXC$REALLOC_OPT + #endif /* VMS and VAXC */ + + #endif /* G_MALLOC_H */ diff -c gopher+/object/Sockets.c:3.16 gopher+/object/Sockets.c:3.18 *** gopher+/object/Sockets.c:3.16 Fri May 27 00:09:07 1994 --- gopher+/object/Sockets.c Fri May 27 00:09:07 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/04/08 20:05:53 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/Sockets.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.18 $ ! * $Date: 1994/04/25 03:46:03 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/Sockets.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,26 ---- ********************************************************************* * Revision History: * $Log: Sockets.c,v $ + * Revision 3.18 1994/04/25 03:46:03 lindner + * Fix for NETLIB and CMUIP + * + * Revision 3.17 1994/04/25 03:36:59 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.16 1994/04/08 20:05:53 lindner * gcc -Wall fixes * *************** *** 139,145 **** return(sockfd); } - #endif /* --- 145,150 ---- *************** *** 210,215 **** --- 215,221 ---- } + #endif /* not CMUIP nor NETLIB */ *************** *** 398,404 **** tem = ntohs(we.sin_port); ! Debug("Here we go...\n",0); if ((sockfd = accept(s, (struct sockaddr *) &we, &len)) < 0) { return ErrSocketConnect; --- 404,410 ---- tem = ntohs(we.sin_port); ! Debugmsg("Here we go...\n"); if ((sockfd = accept(s, (struct sockaddr *) &we, &len)) < 0) { return ErrSocketConnect; diff -c gopher+/object/compatible.c:3.12 gopher+/object/compatible.c:3.13 *** gopher+/object/compatible.c:3.12 Fri May 27 00:09:08 1994 --- gopher+/object/compatible.c Fri May 27 00:09:08 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.12 $ ! * $Date: 1994/04/08 20:05:55 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/compatible.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.13 $ ! * $Date: 1994/04/25 03:34:34 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/compatible.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: compatible.c,v $ + * Revision 3.13 1994/04/25 03:34:34 lindner + * Put back alpha patch (Fote) + * * Revision 3.12 1994/04/08 20:05:55 lindner * gcc -Wall fixes * *************** *** 353,363 **** int flags; unsigned int mode; { - #ifdef __ALPHA - return open ( name, flags, mode); - #else return open ( name, flags, mode, "mbc=32"); - #endif } #endif --- 356,362 ---- diff -c gopher+/object/compatible.h:3.20 gopher+/object/compatible.h:3.23 *** gopher+/object/compatible.h:3.20 Fri May 27 00:09:08 1994 --- gopher+/object/compatible.h Fri May 27 00:09:08 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.20 $ ! * $Date: 1994/04/08 20:05:56 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/compatible.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.23 $ ! * $Date: 1994/05/14 04:14:40 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/compatible.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,29 ---- ********************************************************************* * Revision History: * $Log: compatible.h,v $ + * Revision 3.23 1994/05/14 04:14:40 lindner + * Fix for svr4.2 on unisys + * + * Revision 3.22 1994/05/11 02:41:57 lindner + * Automagically define NO_VFORK for SCO + * + * Revision 3.21 1994/04/25 03:36:17 lindner + * eliminate redefinition of open to open_vmsopt() for ALPHA (Fote) + * * Revision 3.20 1994/04/08 20:05:56 lindner * gcc -Wall fixes * *************** *** 167,173 **** /******************** For strcasecmp() */ ! #if defined(NO_STRCASECMP) || defined(VMS) # undef NO_STRCASECMP # define NO_STRCASECMP int strcasecmp(); --- 176,182 ---- /******************** For strcasecmp() */ ! #if defined(NO_STRCASECMP) || defined(VMS) || defined(__USLC__) # undef NO_STRCASECMP # define NO_STRCASECMP int strcasecmp(); *************** *** 214,221 **** --- 223,232 ---- # define fopen fopen_VMSopt FILE *fopen_VMSopt(); + #ifndef __ALPHA # define open open_VMSopt int open_VMSopt(); + #endif # if defined(UCX) # define closenet close *************** *** 252,258 **** #define S_IXUSR S_IEXEC #endif ! #if defined(NO_VFORK) || defined(_AUX_SOURCE) || defined(sgi) || defined(_AIX) # define vfork fork #endif --- 263,269 ---- #define S_IXUSR S_IEXEC #endif ! #if defined(NO_VFORK) || defined(_AUX_SOURCE) || defined(sgi) || defined(_AIX) || defined(M_XENIX) # define vfork fork #endif diff -c gopher+/object/fileio.c:3.16 gopher+/object/fileio.c:3.20 *** gopher+/object/fileio.c:3.16 Fri May 27 00:09:09 1994 --- gopher+/object/fileio.c Fri May 27 00:09:09 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/04/14 18:14:49 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/fileio.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.20 $ ! * $Date: 1994/05/25 20:57:20 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/fileio.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,39 ---- ********************************************************************* * Revision History: * $Log: fileio.c,v $ + * Revision 3.20 1994/05/25 20:57:20 lindner + * Fix for piped play commands + * + * Revision 3.19 1994/04/25 03:44:42 lindner + * Don't block empty FIOsystem() command on VMS. That's what's used for + * the '!' or '$' commands, and they've already be checked for permission + * in Gopher.c. + * + * Reversed DCLsystem() return values in CURCurses.c, and eliminated the + * reversing kludge in FIOsystem(). + * + * Fixed break of open() for Alpha. (all From F.Macrides) + * + * Revision 3.18 1994/04/25 03:37:00 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * + * Revision 3.17 1994/04/25 02:18:46 lindner + * Fix for gcc-Wall + * * Revision 3.16 1994/04/14 18:14:49 lindner * Fix for closing null files * *************** *** 178,188 **** FileIO *fio; /* Okay, try and open up the file */ - #ifdef VMS - fd = open_VMSopt(fname, flags, mode); - #else fd = open(fname, flags, mode ); - #endif if (fd < 0) return(NULL); /* Couldn't open file */ --- 197,203 ---- *************** *** 301,307 **** int result; if (fio == NULL) ! return; if (FIOgetPid(fio) >= 0) { --- 316,322 ---- int result; if (fio == NULL) ! return(0); if (FIOgetPid(fio) >= 0) { *************** *** 387,393 **** length = strlen(str); if (FIOwriten(fio, str, length) != length) { ! Debug("writestring: writen failed\n",0); return(-1); } else --- 402,408 ---- length = strlen(str); if (FIOwriten(fio, str, length) != length) { ! Debugmsg("writestring: writen failed\n"); return(-1); } else *************** *** 728,740 **** char **argv, i; int result; - if (cmd == NULL || *cmd == '\0') - return(-1); - #ifdef VMS ! return(1 - DCLsystem(cmd)); /* VMS system returns opposite values.. */ #else argv = FIOgetargv(cmd); result = FIOexecv(argv[0], argv); --- 743,755 ---- char **argv, i; int result; #ifdef VMS ! return(DCLsystem(cmd)); /* VMS system returns opposite values.. */ #else + if (cmd == NULL || *cmd == '\0') + return(-1); + argv = FIOgetargv(cmd); result = FIOexecv(argv[0], argv); *************** *** 762,767 **** --- 777,785 ---- if (cmd == NULL) return(NULL); + + if (*cmd == '|') + cmd++; argv = FIOgetargv(cmd); diff -c gopher+/object/fileio.h:3.7 gopher+/object/fileio.h:3.8 *** gopher+/object/fileio.h:3.7 Fri May 27 00:09:09 1994 --- gopher+/object/fileio.h Fri May 27 00:09:09 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.7 $ ! * $Date: 1994/04/22 06:42:02 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/fileio.h,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.8 $ ! * $Date: 1994/04/25 03:40:07 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/fileio.h,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: fileio.h,v $ + * Revision 3.8 1994/04/25 03:40:07 lindner + * VMS socket stuff still wasn't working.. + * * Revision 3.7 1994/04/22 06:42:02 lindner * better compatibility checking * *************** *** 92,112 **** * More elegant way of doing socket writes than ifdefs everywhere */ ! #if defined(VMS) && !defined(UCX) int DCLsystem(/* char */); # define system(a) DCLsystem(a) # if defined(WOLLONGONG) || defined(CMUIP) || defined(NETLIB) # define socket_write netwrite # define socket_read netread # define socket_close netclose # define FIO_NOMULTIEOF # endif - /* Note that Multinet already has socket_* */ - #else ! /* Unix systems and VMS UCX */ # define socket_write write # define socket_read read # define socket_close close --- 95,122 ---- * More elegant way of doing socket writes than ifdefs everywhere */ ! #if defined(VMS) int DCLsystem(/* char */); # define system(a) DCLsystem(a) + /** Note that Multinet already has socket_* **/ # if defined(WOLLONGONG) || defined(CMUIP) || defined(NETLIB) # define socket_write netwrite # define socket_read netread # define socket_close netclose + # endif + # if defined(UCX) + # define socket_write write + # define socket_read read + # define socket_close close + # endif + /** Note that Wollongong is like Multinet for EPIPE handling **/ + # if defined(UCX) || defined(CMUIP) || defined(NETLIB) # define FIO_NOMULTIEOF # endif #else ! /* Unix systems */ # define socket_write write # define socket_read read # define socket_close close diff -c gopher+/object/util.c:3.15 gopher+/object/util.c:3.16 *** gopher+/object/util.c:3.15 Fri May 27 00:09:09 1994 --- gopher+/object/util.c Fri May 27 00:09:09 1994 *************** *** 1,7 **** /******************************************************************** * $Author: lindner $ ! * $Revision: 3.15 $ ! * $Date: 1994/03/31 21:04:36 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/util.c,v $ * $State: Exp $ * --- 1,7 ---- /******************************************************************** * $Author: lindner $ ! * $Revision: 3.16 $ ! * $Date: 1994/04/25 03:37:01 $ * $Source: /export/arcwelder/GopherSrc/CVS/gopher+/object/util.c,v $ * $State: Exp $ * *************** *** 15,20 **** --- 15,23 ---- ********************************************************************* * Revision History: * $Log: util.c,v $ + * Revision 3.16 1994/04/25 03:37:01 lindner + * Modifications for Debug() and mismatched NULL arguments, added Debugmsg + * * Revision 3.15 1994/03/31 21:04:36 lindner * Mitra's 2.011 debug patch * *************** *** 253,259 **** length = strlen(stringptr); if (writen(fd, stringptr, length) != length) { ! Debug("writestring: writen failed\n",0); return(-1); } else --- 256,262 ---- length = strlen(stringptr); if (writen(fd, stringptr, length) != length) { ! Debugmsg("writestring: writen failed\n"); return(-1); } else