Source Code 1994 March/Source_Code_CD-ROM_Walnut_Creek_March_1994.iso/compsrcs/x/volume20/xarchie/patch01

Text File | 1993-08-05 | 32.0 KB | 958 lines

Newsgroups: comp.sources.x
From: [e-mail] (George Ferguson)
Subject: v20i107:  xarchie - An X browser interface to Archie, Patch01
Message-ID: <[e-mail]>
X-Md4-Signature: 6ff603b52941e8727fa004d4ffdef7ce
Sender: [e-mail] (Chris Olson)
Organization: Sterling Software
Date: Thu, 5 Aug 1993 18:43:14 GMT
Approved: [e-mail]

Submitted-by: [e-mail] (George Ferguson)
Posting-number: Volume 20, Issue 107
Archive-name: xarchie/patch01
Environment: X11
Patch-To: xarchie: Volume 20, Issue 29-52

This patch brings xarchie version 2.0.6 up to version 2.0.7. It and
all previous patches and the complete xarchie-2.0.7 distribution are
available from export.lcs.mit.edu in /contrib.

This patch fixes a few minor bugs, adds some weight and server
information, and adds information to the manpage and PROBLEMS file
based on feedback from the 2.0.6 release.

Save this patch into a file and apply it by doing "patch -p <file" in
the xarchie source directory, or apply it from within your newsreader
by doing "|patch -p -d directory" (if your newsreader supports it).
Don't forget the "-p" flag or the subdirectories will not get properly
patched.

#! /bin/sh
# This is a shell archive.  Remove anything before this line, then feed it
# into a shell via "sh file" or similar.  To overwrite existing files,
# type "sh file -c".
# Contents:  xarchie.p1
# Wrapped by chris@sparky on Thu Aug  5 13:38:14 1993
PATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:/usr/lbin ; export PATH
echo If this archive is complete, you will see the following message:
echo '          "shar: End of archive 1 (of 1)."'
if test -f 'xarchie.p1' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'xarchie.p1'\"
else
  echo shar: Extracting \"'xarchie.p1'\" \(29237 characters\)
  sed "s/^X//" >'xarchie.p1' <<'END_OF_FILE'
X*** ../xarchie-2.0.6/patchlevel.h    Mon Jun  7 12:54:36 1993
X--- patchlevel.h    Wed Jun 30 14:53:44 1993
X***************
X*** 9,16 ****
X   * Version 2.0.4: 14 May 1993
X   * Version 2.0.5:  1 Jun 1993
X   * Version 2.0.6:  7 Jun 1993
X   */
X
X  #undef BETA
X  #define VERSION        2.0
X! #define PATCHLEVEL    6
X--- 9,17 ----
X   * Version 2.0.4: 14 May 1993
X   * Version 2.0.5:  1 Jun 1993
X   * Version 2.0.6:  7 Jun 1993
X+  * Version 2.0.7: 30 Jun 1993
X   */
X
X  #undef BETA
X  #define VERSION        2.0
X! #define PATCHLEVEL    7
X*** ../xarchie-2.0.6/PROBLEMS    Tue Jun  1 13:52:15 1993
X--- PROBLEMS    Fri Jun 18 14:15:01 1993
X***************
X*** 3,9 ****
X                 George Ferguson
X                [e-mail]
X
X!                   1 Jun 1993
X
X  The following list includes problems that I have heard about
X  repeatedly, and which I am tired of hearing about. Sometimes there's a
X--- 3,9 ----
X                 George Ferguson
X                [e-mail]
X
X!                   16 Jun 1993
X
X  The following list includes problems that I have heard about
X  repeatedly, and which I am tired of hearing about. Sometimes there's a
X***************
X*** 35,40 ****
X--- 35,45 ----
X         _XtQString
X         _XtQFont
X         _XtQFontStruct
X+  4b. I get something like the following from my linker under Solaris2.2:
X+     ld: Undefined symbol
X+        _step
X+        _compile
X+        _advance
X   5. The linker complains about -lresolv.
X   6. I can't see anything in the Text widgets, but xarchie appears to
X      be doing something.
X***************
X*** 63,68 ****
X--- 68,76 ----
X      Resource id in failed request:  0x0
X      Serial number of failed request:  147
X      Current serial number in output stream:  149
X+ 18. When I try to run xarchie, especially with an X terminal, it says
X+     it can't open the display. I have my DISPLAY variable set
X+     correctly.
X
X
X  QUESTIONS and ANSWERS:
X***************
X*** 118,123 ****
X--- 126,163 ----
X      Your mileage may vary. I suggest doing this if only if necessary
X      (that is, if your executable isn't executable).
X
X+     >From: [e-mail] (Stephen [kiwin] PALM)
X+     >
X+     >Using -Bstatic can make a huge binary.  Xmu is the only file that needs to
X+     >be static  so surrounding Xmu with -Bstatic -Bdynamic in the final
X+     >compile works too.  eg:  ... -lXaw -Bstatic -lXmu -Bdynamic -lXt ...
X+
X+     >From: [e-mail] (Ivan Auger)
X+     >
X+     >You need sun patch 100573-03. The problem is caused by an
X+     >incorrectly built Xmu library.  Then you will not the undefined
X+     >ld symbols:
X+     >  _get_wmShellWidgetClass
X+     > _get_applicationShellWidgetClass
X+     >
X+     >Patch-ID# 100573-03
X+     >Keywords: libxmu, shared, symbols, patch, ld, cte2336, libXmu,
X+     >          undefined, 100170-06
X+     >Synopsis: OpenWindows 3.0: ld patch 100170-06 causes undefined
X+     >          symbols when used with shared libXmu
X+     >Date: 08-Jul-92
X+     >SunOS release: 4.1.1, 4.1.2
X+     >Unbundled Product: OpenWindows
X+     >Unbundled Release: 3.0
X+     >Topic: Patch for libXmu
X+     >BugId's fixed with this patch: 1087332
X+     >Architectures for which this patch is available: sun4
X+     >Patches which may conflict with this patch:
X+     >Obsoleted by:
X+     >Files included with this patch: libXmu.so.4.0, libXmu.sa.4.0
X+     >Problem Description: With patched ld and libc, customer is
X+                           getting undefined symbols
X+
X   4. I get the following message from my linker:
X      ld: Undefined symbol
X         _XtStrings
X***************
X*** 153,158 ****
X--- 193,214 ----
X      It could also mean you're using X11R3, in which case all bets are
X      off.
X
X+  4b. I get something like the following from my linker under Solaris2.2:
X+     ld: Undefined symbol
X+        _step
X+        _compile
X+        _advance
X+
X+     Apparently in Solaris2.2, you need to link against the "string
X+     pattern-matching  & pathname manipulation library, libgen." How
X+     they get "gen" from this I don't know, but you need it to find the
X+     regexp routines. Add -lgen to the LOCAL_LIBRARIES line in the
X+     Imakefile and rebuild (xmkmf, etc.).
X+
X+     Since xarchie doesn't make use of the FWF Directory regexp
X+     capabilities anyway, you could just add "DEFINES=-DNO_REGEXP" to
X+     the Imakefile there, but I haven't tested that.
X+
X   5. The linker complains about -lresolv.
X
X      From the INSTALL file:
X***************
X*** 315,317 ****
X--- 371,393 ----
X      Further suggestions about this should be directed to Brian Totty
X      at the FWF ([e-mail], [e-mail]),
X      although you can CC: me so I know what's going on.
X+
X+ 18. When I try to run xarchie, especially with an X terminal, it says
X+     it can't open the display. I have my DISPLAY variable set
X+     correctly.
X+
X+     As far as I can tell, this problem arises with systems (Suns?)
X+     that run NIS for nameserver lookups. Xarchie uses hostname lookup
X+     for two things: (1) to interpret the DISPLAY variable and
X+     determine which host to open the display on; and (2) to lookup the
X+     IP addresses of host for Archie queries and ftp connections. For
X+     the second function, you presumably need DNS lookups, which is why
X+     some systems require "-lresolv" to be linked in. It's my guess
X+     that this somehow screws up the interpretation of $DISPLAY.
X+
X+     A workaround is to specify the IP address of the displaying host
X+     in the DISPLAY variable, as in "NNN.NNN.NNN.NNN:0.0" rather than
X+     "foobar:0.0". This results in inet_addr() begin called rather than
X+     gethostbyname() (in the XOpenDisplay() call), for those of you
X+     interested in working on this. Xarchie also interprets numeric IP
X+     addresses in this way, in case you care.
X*** ../xarchie-2.0.6/README    Mon Jun  7 12:51:36 1993
X--- README    Wed Jun 30 15:09:57 1993
X***************
X*** 2,8 ****
X
X          George Ferguson, [e-mail]
X
X!              Last Change: 14 May 1993
X
X  DISCLAIMER:
X
X--- 2,8 ----
X
X          George Ferguson, [e-mail]
X
X!              Last Change: 30 Jun 1993
X
X  DISCLAIMER:
X
X***************
X*** 72,77 ****
X--- 72,104 ----
X       in the manpage.
X
X  HISTORY:
X+
X+ Version 2.0.7 - 30 Jun 1993
X+ - Removed extra quotes in types.c.
X+   <[e-mail]>
X+ - Fixed setting of menu mark on Host menu (m-settings.c).
X+   <[e-mail]>
X+ - Duplicate line for ftpStripButton.fromVert in Xarchie.ad deleted.
X+   <[e-mail]>
X+ - Added weights for France (weight.c)
X+   <[e-mail]>
X+ - Added weights for Germany (weight.c)
X+   <[e-mail]>,<[e-mail]>
X+ - Added new server in Switzerland (Xarchie.ad)
X+   <[e-mail]>
X+ - Added text regarding undefined symbols in OW to PROBLEMS file.
X+   <[e-mail]>, <[e-mail]>
X+ - Fixes for SCO OpenDesktop 3.0 (FWF/Dir/Directory.[hc])
X+   <[e-mail]>
X+ - Fixes for Encore Multimax (Umax 4.3)
X+   <[e-mail]>
X+ - Added line to About panel referring to "archie-admin" address.
X+ - Changed identifier "regexp" in FWF/Dir/RegExp.c since it conflicts
X+   with a library function on some platforms.
X+ - Deleted most sample weights from Xarchie.ad since we prefer to use the
X+   auto-select mechanism in weight.c anyway.
X+ - Added text to PROBLEMS file for people with NIS problems regarding
X+   the DISPLAY variable.
X
X  Version 2.0.6 - 7 Jun 1993
X  - Allow SVR4 as well as SYSV for getwd() in Director.c, FChooser.c.
X*** ../xarchie-2.0.6/Xarchie.ad    Fri May 14 11:17:59 1993
X--- Xarchie.ad    Wed Jun 30 15:17:52 1993
X***************
X*** 9,14 ****
X--- 9,19 ----
X  ! 13 May 1993: Updated US weights to include "org", and others to have
X  !           correct US lists (even though they're all commented out).
X  ! 14 May 1993: Cleanups for when MULTILIST not used (more List resources).
X+ ! 30 Jun 1993: Deleted redundant entry for ftpStripButton.fromVert.
X+ !           Added archie.switch.ch to hostMenu.
X+ !           Deleted sample weights (see weight.c) since we prefer
X+ !           to auto-detect the weightlist anyway.
X+ !              Added line to About panel referring to archie-admin address.
X  !
X
X  !    -    -    -    -    -    -    -    -    -
X***************
X*** 80,106 ****
X  !3   uk de nl fi fr eu.net\n\
X  !100 au nz jp
X
X- ! For Sweden, from Peter J Nilsson ([e-mail]):
X- !Xarchie*hostWeights:\
X- !1   se\n\
X- !2   fi dk no\n\
X- !10  eu.net nl fr de\n\
X- !20  edu com gov net mil us org\n\
X- !100 au nz jp
X-
X- ! For the UK, from GF:
X- !Xarchie*hostWeights:\
X- !1   uk\n\
X- !2   se fi dk no nl fr de eu.net\n\
X- !20  edu com gov net mil us org\n\
X- !100 au nz jp
X-
X- ! For New Zealand, from [e-mail]:
X- !Xarchie*hostWeights:\
X- !1   nz\n\
X- !10  edu com gov net mil us org jp\n\
X- !20  se fi dk no nl fr de eu.net uk au
X-
X  !    -    -    -    -    -    -    -    -    -
X  !    -    -    -    -    -    -    -    -    -
X  ! Defaults for all the classes of widgets
X--- 85,90 ----
X***************
X*** 502,508 ****
X  Xarchie*settingsForm*ftpStripButton.fromVert:    ftpTypeButton
X  Xarchie*settingsForm*ftpStripButton.fromHoriz:    ftpTraceButton
X  Xarchie*settingsForm*ftpStripButton.horizDistance: 52
X- Xarchie*settingsForm*ftpStripButton.fromVert:    ftpTypeButton
X  Xarchie*settingsForm*ftpStripLabel.fromHoriz:    ftpStripButton
X  Xarchie*settingsForm*ftpStripLabel.fromVert:    ftpTypeButton
X  Xarchie*settingsForm*ftpStripLabel.font:    xarchieFont
X--- 486,491 ----
X***************
X*** 734,741 ****
X  Xarchie*aboutShell*aboutLabel5.label:    \ \ \ \ \ \ \ \ \ \ \ \ \ Prospero: [e-mail]
X  Xarchie*aboutShell*aboutLabel5.fromVert:    aboutLabel4
X
X  Xarchie*aboutShell*aboutDoneButton.label:    Dismiss
X! Xarchie*aboutShell*aboutDoneButton.fromVert:    aboutLabel5
X  Xarchie*aboutShell*aboutDoneButton.translations:#override\n\
X      <BtnDown>,<BtnUp>:    about-done() \n
X
X--- 717,727 ----
X  Xarchie*aboutShell*aboutLabel5.label:    \ \ \ \ \ \ \ \ \ \ \ \ \ Prospero: [e-mail]
X  Xarchie*aboutShell*aboutLabel5.fromVert:    aboutLabel4
X
X+ Xarchie*aboutShell*aboutLabel6.label:    \ \ Archie servers: archie-admin@<archie-host>
X+ Xarchie*aboutShell*aboutLabel6.fromVert:    aboutLabel5
X+
X  Xarchie*aboutShell*aboutDoneButton.label:    Dismiss
X! Xarchie*aboutShell*aboutDoneButton.fromVert:    aboutLabel6
X  Xarchie*aboutShell*aboutDoneButton.translations:#override\n\
X      <BtnDown>,<BtnUp>:    about-done() \n
X
X***************
X*** 835,841 ****
X  Xarchie*hostMenuItem9.label:    archie.ncu.edu.tw      (Taiwan)
X  Xarchie*hostMenuItem10.label:    archie.nz              (New Zealand)
X  Xarchie*hostMenuItem11.label:    archie.th-darmstadt.de (Germany)
X! Xarchie*numHosts:               12
X  Xarchie*hostMenu*leftMargin:    15
X  ! These translations are for popups only
X  Xarchie*hostMenu.translations:#override\n\
X--- 821,828 ----
X  Xarchie*hostMenuItem9.label:    archie.ncu.edu.tw      (Taiwan)
X  Xarchie*hostMenuItem10.label:    archie.nz              (New Zealand)
X  Xarchie*hostMenuItem11.label:    archie.th-darmstadt.de (Germany)
X! Xarchie*hostMenuItem12.label:    archie.switch.ch       (Switzerland)
X! Xarchie*numHosts:               13
X  Xarchie*hostMenu*leftMargin:    15
X  ! These translations are for popups only
X  Xarchie*hostMenu.translations:#override\n\
X*** ../xarchie-2.0.6/Xarchie.ad.h    Fri May 14 13:06:24 1993
X--- Xarchie.ad.h    Wed Jun 30 15:15:48 1993
X***************
X*** 295,301 ****
X  "Xarchie*settingsForm*ftpStripButton.fromVert:    ftpTypeButton",
X  "Xarchie*settingsForm*ftpStripButton.fromHoriz:    ftpTraceButton",
X  "Xarchie*settingsForm*ftpStripButton.horizDistance: 52",
X- "Xarchie*settingsForm*ftpStripButton.fromVert:    ftpTypeButton",
X  "Xarchie*settingsForm*ftpStripLabel.fromHoriz:    ftpStripButton",
X  "Xarchie*settingsForm*ftpStripLabel.fromVert:    ftpTypeButton",
X  "Xarchie*settingsForm*ftpStripLabel.font:    xarchieFont",
X--- 295,300 ----
X***************
X*** 454,461 ****
X  "Xarchie*aboutShell*aboutLabel4.vertDistance:    10",
X  "Xarchie*aboutShell*aboutLabel5.label:    \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ Prospero: [e-mail]",
X  "Xarchie*aboutShell*aboutLabel5.fromVert:    aboutLabel4",
X  "Xarchie*aboutShell*aboutDoneButton.label:    Dismiss",
X! "Xarchie*aboutShell*aboutDoneButton.fromVert:    aboutLabel5",
X  "Xarchie*aboutShell*aboutDoneButton.translations:#override\\n\
X      <BtnDown>,<BtnUp>:    about-done() \\n",
X  "Xarchie*ftpTraceShell.title:        Xarchie Ftp Trace",
X--- 453,462 ----
X  "Xarchie*aboutShell*aboutLabel4.vertDistance:    10",
X  "Xarchie*aboutShell*aboutLabel5.label:    \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ Prospero: [e-mail]",
X  "Xarchie*aboutShell*aboutLabel5.fromVert:    aboutLabel4",
X+ "Xarchie*aboutShell*aboutLabel6.label:                   Archie servers: archie-admin@<archie-host>",
X+ "Xarchie*aboutShell*aboutLabel6.fromVert:    aboutLabel5",
X  "Xarchie*aboutShell*aboutDoneButton.label:    Dismiss",
X! "Xarchie*aboutShell*aboutDoneButton.fromVert:    aboutLabel6",
X  "Xarchie*aboutShell*aboutDoneButton.translations:#override\\n\
X      <BtnDown>,<BtnUp>:    about-done() \\n",
X  "Xarchie*ftpTraceShell.title:        Xarchie Ftp Trace",
X***************
X*** 534,540 ****
X  "Xarchie*hostMenuItem9.label:    archie.ncu.edu.tw      (Taiwan)",
X  "Xarchie*hostMenuItem10.label:    archie.nz              (New Zealand)",
X  "Xarchie*hostMenuItem11.label:    archie.th-darmstadt.de (Germany)",
X! "Xarchie*numHosts:               12",
X  "Xarchie*hostMenu*leftMargin:    15",
X  "Xarchie*hostMenu.translations:#override\\n\
X       <EnterWindow>:     highlight()             \\n\
X--- 535,542 ----
X  "Xarchie*hostMenuItem9.label:    archie.ncu.edu.tw      (Taiwan)",
X  "Xarchie*hostMenuItem10.label:    archie.nz              (New Zealand)",
X  "Xarchie*hostMenuItem11.label:    archie.th-darmstadt.de (Germany)",
X! "Xarchie*hostMenuItem12.label:    archie.switch.ch       (Switzerland)",
X! "Xarchie*numHosts:               13",
X  "Xarchie*hostMenu*leftMargin:    15",
X  "Xarchie*hostMenu.translations:#override\\n\
X       <EnterWindow>:     highlight()             \\n\
X*** ../xarchie-2.0.6/about.c    Fri May 14 10:34:46 1993
X--- about.c    Wed Jun 30 15:07:48 1993
X***************
X*** 8,13 ****
X--- 8,14 ----
X   * 13 May 1993: Fixed array bound error in popupAboutPanel().
X   *        Changed the way the version info is printed.
X   *        Changed style of animation (spare time killer).
X+  * 30 Jun 1993: Added one more line to About panel for "archie-admin" note.
X   */
X  #include <stdio.h>
X  #include <X11/Intrinsic.h>
X***************
X*** 179,184 ****
X--- 180,186 ----
X                      form,args,1);
X      (void)XtCreateManagedWidget("aboutLabel4",labelWidgetClass,form,NULL,0);
X      (void)XtCreateManagedWidget("aboutLabel5",labelWidgetClass,form,NULL,0);
X+     (void)XtCreateManagedWidget("aboutLabel6",labelWidgetClass,form,NULL,0);
X      (void)XtCreateManagedWidget("aboutDoneButton",commandWidgetClass,
X                  form,NULL,0);
X      XtRealizeWidget(aboutShell);
X*** ../xarchie-2.0.6/actions.c    Thu Apr 22 15:28:56 1993
X--- actions.c    Wed Jun 30 15:01:04 1993
X***************
X*** 6,11 ****
X--- 6,12 ----
X   *
X   * George Ferguson, [e-mail], 2 Nov 1991.
X   * Version 2.0: 23 Apr 1993.
X+  * 30 Jun 1993: Use sindex() from support.c rather than strstr(3).
X   */
X
X  #include <stdio.h>
X***************
X*** 30,35 ****
X--- 31,37 ----
X  #include "debug.h"
X  extern void abortDirsend();        /* dirsend.c */
X  extern void ftpAbortTransfer();        /* ftp-actions.c */
X+ extern char *sindex();            /* support.c (replaces strstr(3)) */
X
X  /*
X   * Functions defined here
X***************
X*** 123,129 ****
X      case GfExactSubstr:
X      case GfSubcase:
X      case GfExactSubcase:
X!         gif = (strstr(s,"gif") || strstr(s,"GIF"));
X          break;
X      case GfRegexp:
X      case GfExactRegexp:
X--- 125,131 ----
X      case GfExactSubstr:
X      case GfSubcase:
X      case GfExactSubcase:
X!         gif = (sindex(s,"gif") || sindex(s,"GIF"));
X          break;
X      case GfRegexp:
X      case GfExactRegexp:
X*** ../xarchie-2.0.6/fchooser.c    Fri May 14 10:58:41 1993
X--- fchooser.c    Wed Jun 30 14:54:08 1993
X***************
X*** 20,25 ****
X--- 20,26 ----
X   * George Ferguson, [e-mail], 23 Apr 1993.
X   * 13 May 1993: Fixes for when FILECHOOSER not defined.
X   * 14 May 1993: More of the same (find MAXPATHLEN), initialize dir.
X+  * 30 Jun 1993: Encore umax fixes from [e-mail].
X   *
X   */
X  #include "config.h"
X***************
X*** 30,35 ****
X--- 31,39 ----
X  #include <stdio.h>
X  #include <sys/types.h>
X  #include <sys/stat.h>
X+ #ifndef S_ISDIR
X+ # define S_ISDIR(m) (m & S_IFDIR)    /* Encore umax */
X+ #endif
X  #include <X11/Intrinsic.h>
X  #include <X11/StringDefs.h>
X  #include <X11/keysym.h>
X*** ../xarchie-2.0.6/ftp.c    Tue Jun  1 13:42:37 1993
X--- ftp.c    Wed Jun 30 14:54:16 1993
X***************
X*** 38,46 ****
X--- 38,50 ----
X   *
X   * 28 Apr 1993: Status mesage for bytes transferred was backwards.
X   *  1 Jun 1993: Fixes for ISC. Are these needed for other SYS5?
X+  * 30 Jun 1993: Fixes for Encore Umax (used cpp symbol "umax" as a guess).
X   */
X  #include <stdio.h>
X  #include <errno.h>
X+ #ifndef MSDOS
X+ extern int errno;    /* Encore needs this despite <errno.h> */
X+ #endif
X  #include "config.h"
X  #ifdef HAVE_SYS_PARAM_H
X  #include <sys/param.h>
X***************
X*** 62,72 ****
X   * Portable non-blocking I/O macros, I hope.
X   *   hp300 : From [e-mail]
X   *   sgi   : From [e-mail]
X   */
X  #if defined(hp300)
X    /* Here's for BSD, maybe, but Sys5 can't tell this from EOF. */
X  # include <fcntl.h>
X! # define MAKE_NONBLOCKING(fd) fcntl(fd,F_SETFL,O_NDELAY)
X  # define ITWOULDBLOCK EWOULDBLOCK
X  #else
X  #if defined(sgi)
X--- 66,77 ----
X   * Portable non-blocking I/O macros, I hope.
X   *   hp300 : From [e-mail]
X   *   sgi   : From [e-mail]
X+  *   umax  : From [e-mail]
X   */
X  #if defined(hp300)
X    /* Here's for BSD, maybe, but Sys5 can't tell this from EOF. */
X  # include <fcntl.h>
X! # define MAKE_BONBLOCKING(fd) fcntl(fd,F_SETFL,O_NDELAY)
X  # define ITWOULDBLOCK EWOULDBLOCK
X  #else
X  #if defined(sgi)
X***************
X*** 74,85 ****
X  # define MAKE_NONBLOCKING(fd) fcntl(fd,F_SETFL,O_NONBLOCK)
X  # define ITWOULDBLOCK EWOULDBLOCK
X  #else
X    /* This is POSIX, the default, which uses EAGAIN. */
X  # include <fcntl.h>
X  # define MAKE_NONBLOCKING(fd) fcntl(fd,F_SETFL,O_NONBLOCK)
X  # define ITWOULDBLOCK EAGAIN
X! #endif
X! #endif
X  /*
X   * Networking includes from Brendan Kehoe (dirsend.c)
X   */
X--- 79,95 ----
X  # define MAKE_NONBLOCKING(fd) fcntl(fd,F_SETFL,O_NONBLOCK)
X  # define ITWOULDBLOCK EWOULDBLOCK
X  #else
X+ #if defined(umax)
X+ # define MAKE_NONBLOCKING(fd) fcntl(fd,F_SETFL,FNDELAY)
X+ # define ITWOULDBLOCK EWOULDBLOCK
X+ #else
X    /* This is POSIX, the default, which uses EAGAIN. */
X  # include <fcntl.h>
X  # define MAKE_NONBLOCKING(fd) fcntl(fd,F_SETFL,O_NONBLOCK)
X  # define ITWOULDBLOCK EAGAIN
X! #endif /* umax */
X! #endif /* sgi */
X! #endif /* hp300 */
X  /*
X   * Networking includes from Brendan Kehoe (dirsend.c)
X   */
X*** ../xarchie-2.0.6/help-text1.h    Mon Jun  7 12:56:16 1993
X--- help-text1.h    Wed Jun 30 15:16:09 1993
X***************
X*** 2,8 ****
X  NULL,
X  "NAME\n",
X  "     xarchie - X11 browser interface  to\n",
X! "     archie, version 2.0.6\n",
X  "\n",
X  NULL,
X  "SYNOPSIS\n",
X--- 2,8 ----
X  NULL,
X  "NAME\n",
X  "     xarchie - X11 browser interface  to\n",
X! "     archie, version 2.0.7\n",
X  "\n",
X  NULL,
X  "SYNOPSIS\n",
X***************
X*** 2255,2265 ****
X  "\n",
X  NULL,
X  " Reporting Bugs\n",
X! "     If you  have  any  questions  about\n",
X! "     Archie  itself,  write  to  archie-\n",
X! "     [e-mail]. If you  have  ques-\n",
X! "     tions   about  Prospero,  write  to\n",
X! "     [e-mail].\n",
X  "\n",
X  "     If you have a problem, please  read\n",
X  "     the  \"Known  Bugs\"  section  first,\n",
X--- 2255,2270 ----
X  "\n",
X  NULL,
X  " Reporting Bugs\n",
X! "     If you have problems with or  ques-\n",
X! "     tions  about  an  individual Archie\n",
X! "     server site,  contact  archie-admin\n",
X! "     at that site. If you have any ques-\n",
X! "     tions about Archie itself, write to\n",
X! "     [e-mail].  If you have ques-\n",
X! "     tions  about  Prospero,  write   to\n",
X! "     [e-mail].  The  USENET\n",
X! "     newsgroup  comp.archives.admin  may\n",
X! "     also be helpful.\n",
X  "\n",
X  "     If you have a problem, please  read\n",
X  "     the  \"Known  Bugs\"  section  first,\n",
X***************
X*** 2291,2297 ****
X  "     are in charge of the Archie project\n",
X  "     itself.  Individual archie servers,\n",
X  "     however,  are maintained locally at\n",
X! "     each server site.\n",
X  "\n",
X  NULL,
X  "AUTHOR\n",
X--- 2296,2303 ----
X  "     are in charge of the Archie project\n",
X  "     itself.  Individual archie servers,\n",
X  "     however,  are maintained locally at\n",
X! "     each    server    site     (archie-\n",
X! "     admin@<server-host>).\n",
X  "\n",
X  NULL,
X  "AUTHOR\n",
X*** ../xarchie-2.0.6/help-text2.h    Mon Jun  7 12:56:17 1993
X--- help-text2.h    Wed Jun 30 15:16:10 1993
X***************
X*** 109,114 ****
X  ," Known Bugs"},{
X  2256
X  ," Reporting Bugs"},{
X! 2296
X  ,"AUTHOR"},{
X  000,NULL}
X--- 109,114 ----
X  ," Known Bugs"},{
X  2256
X  ," Reporting Bugs"},{
X! 2302
X  ,"AUTHOR"},{
X  000,NULL}
X*** ../xarchie-2.0.6/m-settings.c    Thu Apr 22 15:41:12 1993
X--- m-settings.c    Thu Jun 17 10:41:50 1993
X***************
X*** 435,440 ****
X--- 435,446 ----
X      setNiceMenuMark(appResources.niceLevel);
X  }
X
X+ /*
X+  * This function is more omcplicated than the others, since the value
X+  * of the archieHost resource (that we're getting passed here as the "host"
X+  * parameter) is a prefix of the corresponding menu label, since after
X+  * whitespace there can be informative garbage in the menu item.
X+  */
X  void
X  setHostMenuMark(host)
X  char *host;
X***************
X*** 441,452 ****
X  {
X      Arg args[1];
X      char *str;
X!     int i;
X
X      for (i=0; i < appResources.numHosts; i++) {
X      XtSetArg(args[0],XtNlabel,&str);
X      XtGetValues((Widget)(hostMenuItems[i]),args,1);
X!     if (strncmp(str,host,strlen(host)) == 0)
X          break;
X      }
X      if (i < appResources.numHosts)
X--- 447,462 ----
X  {
X      Arg args[1];
X      char *str;
X!     int i,l;
X
X+     l = strlen(host);
X      for (i=0; i < appResources.numHosts; i++) {
X      XtSetArg(args[0],XtNlabel,&str);
X      XtGetValues((Widget)(hostMenuItems[i]),args,1);
X!     /* Given host must match the entire prefix up to whitespace (if any) */
X!     if ((strlen(str) >= l) &&
X!         (*(str+l) == '\0' || *(str+l) == ' ') &&
X!         strncmp(str,host,l) == 0)
X          break;
X      }
X      if (i < appResources.numHosts)
X*** ../xarchie-2.0.6/types.c    Thu Apr 22 15:47:53 1993
X--- types.c    Wed Jun 30 14:54:28 1993
X***************
X*** 6,11 ****
X--- 6,12 ----
X   * George Ferguson, [e-mail], 12 Sep 1991.
X   * Version 2.0: 23 Apr 1993: For pre-R5 systems, we include the string-
X   *                     to-font-struct converter.
X+  * 30 Jun 1993: Removed extra quotes in stringToSearchType().
X   */
X
X  #include <X11/IntrinsicP.h>
X***************
X*** 218,226 ****
X      return(GfRegexp);
X      if (strcmp(s,GfNExactSubstr) == 0)
X      return(GfExactSubstr);
X!     if (strcmp(s,"GfNExactSubcase") == 0)
X      return(GfExactSubcase);
X!     if (strcmp(s,"GfNExactRegexp") == 0)
X      return(GfExactRegexp);
X      return(GfError);
X  }
X--- 219,227 ----
X      return(GfRegexp);
X      if (strcmp(s,GfNExactSubstr) == 0)
X      return(GfExactSubstr);
X!     if (strcmp(s,GfNExactSubcase) == 0)
X      return(GfExactSubcase);
X!     if (strcmp(s,GfNExactRegexp) == 0)
X      return(GfExactRegexp);
X      return(GfError);
X  }
X*** ../xarchie-2.0.6/weight.c    Mon Jun  7 12:53:48 1993
X--- weight.c    Wed Jun 30 14:54:45 1993
X***************
X*** 6,11 ****
X--- 6,13 ----
X   * 13 May 1993: Add "org" to US weights and make sure others have proper
X   *        US lists.
X   *  7 Jun 1993: Added weights for Norway, from [e-mail].
X+  * 30 Jun 1993: Added weights for France, from [e-mail]
X+  *              Added weights for Germany, [e-mail]
X   */
X
X  #include <stdio.h>
X***************
X*** 95,100 ****
X--- 97,114 ----
X  2   fi dk se\n\
X  10  eu.net nl fr\n\
X  20  edu com gov net de\n\
X+ 100 au nz jp" },
X+ /* For France, from [e-mail] */
X+     { "fr", "1   fr\n\
X+ 2   se fi dk no nl uk de eu.net\n\
X+ 20  edu com gov net mil us org\n\
X+ 100 au nz jp" },
X+ /* For Germany, from [e-mail], modified with
X+    comments from [e-mail]. */
X+     { "de", "1   de\n\
X+ 2   ch uk dk nl fr eu.net\n\
X+ 10  se fi no\n\
X+ 20  edu com gov net mil us\n\
X  100 au nz jp" },
X  };
X
X*** ../xarchie-2.0.6/xarchie.man    Mon Jun  7 12:54:53 1993
X--- xarchie.man    Wed Jun 30 15:15:39 1993
X***************
X*** 15,20 ****
X--- 15,21 ----
X  .\" Version 2.0: 23 Apr 1993
X  .\" 28 Apr 1993: Changed default host to "archie.sura.net(1526)".
X  .\" 13 May 1993: Added stuff about how hostMenu labels are parsed.
X+ .\" 30 Jun 1993: Added archie-admin references.
X  .\"
X  .\" -----------------------------------------------------------------------
X  .\" If formatting for Help, kill the header and footer before .TH
X***************
X*** 23,29 ****
X  ..
X  .de }F
X  .. \}
X! .TH XARCHIE 1 "7 Jun 1993" "U of Rochester"
X  .\" If formatting for Help, set line length and tabs after .TH
X  .if \n(XX \{\
X  .nr LL 40n
X--- 24,30 ----
X  ..
X  .de }F
X  .. \}
X! .TH XARCHIE 1 "30 Jun 1993" "U of Rochester"
X  .\" If formatting for Help, set line length and tabs after .TH
X  .if \n(XX \{\
X  .nr LL 40n
X***************
X*** 32,38 ****
X  .el .ta 4,8,12,16,20,24,28,32,36,40
X  .\" Real manpage begins here
X  .SH NAME
X! xarchie \- X11 browser interface to archie, version 2.0.6
X  .SH SYNOPSIS
X  .na
X  .in +8n
X--- 33,39 ----
X  .el .ta 4,8,12,16,20,24,28,32,36,40
X  .\" Real manpage begins here
X  .SH NAME
X! xarchie \- X11 browser interface to archie, version 2.0.7
X  .SH SYNOPSIS
X  .na
X  .in +8n
X***************
X*** 1687,1695 ****
X  .\"----------------------------------------------------------
X  .SH " Reporting Bugs"
X  .PP
X! If you have any questions about Archie itself, write to
X! [e-mail]. If you have questions about Prospero, write to
X! [e-mail].
X  .PP
X  If you have a problem, please read the "Known Bugs" section first,
X  then contact your local maintainer and/or refer to the PROBLEMS and
X--- 1688,1698 ----
X  .\"----------------------------------------------------------
X  .SH " Reporting Bugs"
X  .PP
X! If you have problems with or questions about an individual Archie
X! server site, contact archie-admin at that site. If you have any
X! questions about Archie itself, write to [e-mail]. If you
X! have questions about Prospero, write to [e-mail]. The
X! USENET newsgroup comp.archives.admin may also be helpful.
X  .PP
X  If you have a problem, please read the "Known Bugs" section first,
X  then contact your local maintainer and/or refer to the PROBLEMS and
X***************
X*** 1707,1713 ****
X  ([e-mail]) is in charge of Prospero, and Alan Emtage and Peter
X  Deutsch ({bajan,peterd}@bunyip.com) are in charge of the Archie
X  project itself.  Individual archie servers, however, are maintained
X! locally at each server site.
X  .\"===========================================================
X  .SH AUTHOR
X  .PP
X--- 1710,1716 ----
X  ([e-mail]) is in charge of Prospero, and Alan Emtage and Peter
X  Deutsch ({bajan,peterd}@bunyip.com) are in charge of the Archie
X  project itself.  Individual archie servers, however, are maintained
X! locally at each server site (archie-admin@<server-host>).
X  .\"===========================================================
X  .SH AUTHOR
X  .PP
X*** ../xarchie-2.0.6/Ad2c/README    Mon Apr 19 16:38:54 1993
X--- Ad2c/README    Thu Jun 17 15:30:02 1993
X***************
X*** 4,10 ****
X           George Ferguson, [e-mail]
X
X                   12 Nov 1990
X!             Updated 8 Jul 1992
X
X  DESCRIPTION:
X
X--- 4,10 ----
X           George Ferguson, [e-mail]
X
X                   12 Nov 1990
X!             Updated 19 Apr 1993
X
X  DESCRIPTION:
X
X*** ../xarchie-2.0.6/FWF/Dir/Directory.c    Thu Jan  7 12:41:32 1993
X--- FWF/Dir/Directory.c    Wed Jun 30 14:11:55 1993
X***************
X*** 132,140 ****
X--- 132,142 ----
X          case S_IFLNK:
X          DirEntryType(de) = F_TYPE_SYM_LINK;
X          break;
X+ #ifdef S_IFSOCK
X          case S_IFSOCK:
X          DirEntryType(de) = F_TYPE_SOCKET;
X          break;
X+ #endif
X  #ifdef S_IFIFO
X          case S_IFIFO:
X          DirEntryType(de) = F_TYPE_FIFO;
X*** ../xarchie-2.0.6/FWF/Dir/Directory.h    Mon Jun  7 12:48:02 1993
X--- FWF/Dir/Directory.h    Wed Jun 30 14:11:16 1993
X***************
X*** 49,54 ****
X--- 49,57 ----
X
X  #include <stdio.h>
X  #include <sys/param.h>
X+ #ifndef MAXPATHLEN
X+ # define MAXPATHLEN 1024
X+ #endif
X  #include <sys/types.h>
X  #include <sys/stat.h>
X
X*** ../xarchie-2.0.6/FWF/Dir/RegExp.c    Sat Nov 28 21:29:45 1992
X--- FWF/Dir/RegExp.c    Thu Jun 17 10:57:30 1993
X***************
X*** 46,57 ****
X  #include <RegExp.h>
X  #include <regexp.h>
X
X! void RegExpCompile(regexp,fsm_ptr,fsm_length)
X! char *regexp,*fsm_ptr;
X  int fsm_length;
X  {
X  #ifndef NO_REGEXP
X!     compile(regexp,fsm_ptr,&(fsm_ptr[fsm_length]),'\0');
X  #endif
X  } /* End RegExpCompile */
X
X--- 46,57 ----
X  #include <RegExp.h>
X  #include <regexp.h>
X
X! void RegExpCompile(reg_exp,fsm_ptr,fsm_length)
X! char *reg_exp,*fsm_ptr;
X  int fsm_length;
X  {
X  #ifndef NO_REGEXP
X!     compile(reg_exp,fsm_ptr,&(fsm_ptr[fsm_length]),'\0');
X  #endif
X  } /* End RegExpCompile */
X
END_OF_FILE
  if test 29237 -ne `wc -c <'xarchie.p1'`; then
    echo shar: \"'xarchie.p1'\" unpacked with wrong size!
  fi
  # end of 'xarchie.p1'
fi
echo shar: End of archive 1 \(of 1\).
cp /dev/null ark1isdone
MISSING=""
for I in 1 ; do
    if test ! -f ark${I}isdone ; then
    MISSING="${MISSING} ${I}"
    fi
done
if test "${MISSING}" = "" ; then
    echo You have the archive.
    rm -f ark[1-9]isdone
else
    echo You still must unpack the following archives:
    echo "        " ${MISSING}
fi
exit 0
exit 0 # Just in case...
--
  // [e-mail]           | Send comp.sources.x submissions to:
\X/  Amiga - The only way to fly! |    [e-mail]
 "It's intuitively obvious to the |
  most casual observer..."        | GCS d+/-- p+ c++ l+ m+ s++/+ g+ w+ t+ r+ x+