Source Code 1994 March/Source_Code_CD-ROM_Walnut_Creek_March_1994.iso/compsrcs/x/volume21/xarchie/patch02

Text File | 1993-09-25 | 17.4 KB | 541 lines

Newsgroups: comp.sources.x
From: [e-mail] (George Ferguson)
Subject: v21i001:  xarchie - An X browser interface to Archie, Patch02
Message-ID: <[e-mail]>
X-Md4-Signature: 75e3904cf9fbd16913c1d93dd5ff80e4
Sender: [e-mail] (Chris Olson)
Organization: Sterling Software
Date: Sat, 25 Sep 1993 16:06:40 GMT
Approved: [e-mail]

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

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

This patch brings xarchie to version 2.0.8. It should be applied
*after* the 2.0.7 patch (patch1) which should appear in comp.sources.x
before this one. This and all previous patches and the complete
xarchie-2.0.8 distribution are available from export.lcs.mit.edu in
/contrib.

This patch fixes a minor bug, changes the way XtAppAddInput() is used
in the hopes of helping with the "select failed" bug for old versions
of X (but don't hold your breath), and adds some weight and server
information (for Italy and Israel).

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.p2
# Wrapped by chris@sparky on Sat Sep 25 11:01:55 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.p2' -a "${1}" != "-c" ; then
  echo shar: Will not clobber existing file \"'xarchie.p2'\"
else
  echo shar: Extracting \"'xarchie.p2'\" \(14398 characters\)
  sed "s/^X//" >'xarchie.p2' <<'END_OF_FILE'
X*** ../xarchie-2.0.7/README    Wed Jun 30 15:09:57 1993
X--- README    Tue Jul 27 10:17:46 1993
X***************
X*** 2,8 ****
X
X          George Ferguson, [e-mail]
X
X!              Last Change: 30 Jun 1993
X
X  DISCLAIMER:
X
X--- 2,8 ----
X
X          George Ferguson, [e-mail]
X
X!              Last Change: 27 Jul 1993
X
X  DISCLAIMER:
X
X***************
X*** 72,77 ****
X--- 72,90 ----
X       in the manpage.
X
X  HISTORY:
X+
X+ Version 2.0.8 - 27 Jul 1993
X+ - Only call XtRemoveTimeOut() if HAVE_RANDOM or HAVE_RAND (about.c).
X+   <[e-mail]>
X+ - New archie server for Italy (Xarchie.ad).
X+   <[e-mail]>
X+ - New archie server for Israel (Xarchie.ad) and weights (weight.c).
X+   <[e-mail]>
X+ - Changed ftp-actions.c to not use Boolean AND of condition flags
X+   since either R4 XtAppAddInput() chokes on them or R4 XtRemoveInput()
X+   doesn't clear one of the select()-mask bits, resulting in the
X+   "select failed" error.
X+ - Changes to files for sync with eventual varchie release.
X
X  Version 2.0.7 - 30 Jun 1993
X  - Removed extra quotes in types.c.
X*** ../xarchie-2.0.7/Xarchie.ad    Wed Jun 30 15:17:52 1993
X--- Xarchie.ad    Tue Jul 27 10:12:07 1993
X***************
X*** 14,19 ****
X--- 14,21 ----
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+ ! 27 Jul 1993: Added archie.unipi.it to hostMenu.
X+ !              Added archie.ac.il to hostMenu.
X  !
X
X  !    -    -    -    -    -    -    -    -    -
X***************
X*** 822,828 ****
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--- 824,832 ----
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*hostMenuItem13.label:    archie.unipi.it        (Italy)
X! Xarchie*hostMenuItem14.label:    archie.ac.el           (Israel)
X! Xarchie*numHosts:               15
X  Xarchie*hostMenu*leftMargin:    15
X  ! These translations are for popups only
X  Xarchie*hostMenu.translations:#override\n\
X*** ../xarchie-2.0.7/Xarchie.ad.h    Wed Jun 30 15:15:48 1993
X--- Xarchie.ad.h    Tue Jul 27 10:24:16 1993
X***************
X*** 453,459 ****
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--- 453,459 ----
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***************
X*** 536,542 ****
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--- 536,544 ----
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*hostMenuItem13.label:    archie.unipi.it        (Italy)",
X! "Xarchie*hostMenuItem14.label:    archie.ac.el           (Israel)",
X! "Xarchie*numHosts:               15",
X  "Xarchie*hostMenu*leftMargin:    15",
X  "Xarchie*hostMenu.translations:#override\\n\
X       <EnterWindow>:     highlight()             \\n\
X*** ../xarchie-2.0.7/about.c    Wed Jun 30 15:07:48 1993
X--- about.c    Tue Jul 27 10:16:21 1993
X***************
X*** 9,14 ****
X--- 9,15 ----
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+  * 27 Jul 1993: Only call XtRemoveTimeOut() if we HAVE_RANDOM or HAVE_RAND.
X   */
X  #include <stdio.h>
X  #include <X11/Intrinsic.h>
X***************
X*** 114,120 ****
X--- 115,123 ----
X  String *params;
X  Cardinal *num_params;
X  {
X+ #if defined(HAVE_RANDOM) || defined(HAVE_RAND)
X      XtRemoveTimeOut(timer);
X+ #endif
X      isPoppedUp = False;
X      XtPopdown(aboutShell);
X  }
X*** ../xarchie-2.0.7/browser.c    Wed Apr 28 12:22:58 1993
X--- browser.c    Thu Jul  8 14:17:01 1993
X***************
X*** 3,8 ****
X--- 3,9 ----
X   *
X   * George Ferguson, [e-mail], 23 Apr 1993.
X   * 28 Apr 1993: Remove some bogus status0("Ready") calls.
X+  *  8 Jul 1993: Don't need actions.h.
X   */
X
X  #include <stdio.h>
X***************
X*** 12,18 ****
X  #include "xtypes.h"
X  #include "appres.h"
X  #include "query.h"
X- #include "actions.h"
X  #include "browser.h"
X  #include "selection.h"
X  #include "display.h"
X--- 13,18 ----
X*** ../xarchie-2.0.7/dirsend.c    Tue Jun  1 13:50:24 1993
X--- dirsend.c    Fri Jul  9 14:51:58 1993
X***************
X*** 1162,1168 ****
X--- 1162,1170 ----
X      if (tmp == 0) {
X      timeoutProc(NULL,&timerId);
X      } else if (tmp < 0 && errno == EINTR) {    /* gf: new for ^C in varchie */
X+ #ifdef DEBUG
X      fprintf(stderr,"select interrupted\n");    /* do nothing, we'll be back */
X+ #endif
X      } else if ((tmp < 0) || !FD_ISSET(lp,&readfds)) {
X  #ifdef DEBUG
X      if (pfs_debug) {
X*** ../xarchie-2.0.7/ftp-actions.c    Thu May 13 16:15:28 1993
X--- ftp-actions.c    Tue Jul 27 10:50:00 1993
X***************
X*** 3,8 ****
X--- 3,9 ----
X   *
X   * George Ferguson, [e-mail], 23 Apr 1993.
X   * 13 May 1993: Check for NULL return from ftpNewContext().
X+  * 27 Jul 1993: Don't use boolean AND of condition flags for XtAppAddInput().
X   */
X
X  #include <stdio.h>
X***************
X*** 334,343 ****
X   * easier to guess big than to figure out where such a magic number lives.
X   */
X  #define NUMFDS 64
X- FtpCallbackProc ftpRegisteredProcs[NUMFDS];
X- FtpContext *ftpRegisteredContexts[NUMFDS];
X- XtInputId ftpRegisteredIds[NUMFDS];
X
X  /*
X   * This function is exported and used by the FTP routines to register
X   * a file descriptor for notification. We register it by recording the
X--- 335,347 ----
X   * easier to guess big than to figure out where such a magic number lives.
X   */
X  #define NUMFDS 64
X
X+ struct _ftpRegisteredFds_struct {
X+     FtpCallbackProc proc;
X+     FtpContext *context;
X+     XtInputId readid,writeid;
X+ } ftpRegisteredFds[NUMFDS];
X+
X  /*
X   * This function is exported and used by the FTP routines to register
X   * a file descriptor for notification. We register it by recording the
X***************
X*** 352,359 ****
X  int fd,flags;
X  FtpCallbackProc proc;
X  {
X-     XtInputMask condition;
X-
X      DEBUG3("RegisterFtpFd: ftpc=0x%x, fd=%d, flags=%d\n",ftpc,fd,flags);
X      if (fd < 0 || fd >= NUMFDS) {
X      fprintf(stderr,"YOW! Attempt to register fd %d!\n",fd);
X--- 356,361 ----
X***************
X*** 362,383 ****
X  #endif
X      return;
X      }
X      switch (flags) {
X        case O_RDONLY:
X!     condition = XtInputReadMask;
X      break;
X        case O_WRONLY:
X!     condition = XtInputWriteMask;
X      break;
X        case O_RDWR:
X!     condition = XtInputReadMask | XtInputWriteMask;
X      break;
X      }
X!     ftpRegisteredProcs[fd] = proc;
X!     ftpRegisteredContexts[fd] = ftpc;
X!     ftpRegisteredIds[fd] =
X!     XtAppAddInput(appContext,fd,(XtPointer)condition,inputCallback,NULL);
X!     DEBUG1("RegisterFtpFd: done: id=0x%x\n",ftpRegisteredIds[fd]);
X  }
X
X  /*
X--- 364,400 ----
X  #endif
X      return;
X      }
X+     ftpRegisteredFds[fd].proc = proc;
X+     ftpRegisteredFds[fd].context = ftpc;
X+     /*
X+      * In R4, we can't give a boolean combination of flags to XtAppAddInput().
X+      * Even if it doesn't complain, XtRemoveInput() won't remove the fd from
X+      * both select() masks, so we'll get the "select failed" message.
X+      */
X      switch (flags) {
X        case O_RDONLY:
X!     ftpRegisteredFds[fd].readid =
X!         XtAppAddInput(appContext,fd,(XtPointer)XtInputReadMask,
X!               inputCallback,NULL);
X!     ftpRegisteredFds[fd].writeid = (XtInputId)NULL;
X      break;
X        case O_WRONLY:
X!     ftpRegisteredFds[fd].readid = (XtInputId)NULL;
X!     ftpRegisteredFds[fd].writeid =
X!         XtAppAddInput(appContext,fd,(XtPointer)XtInputWriteMask,
X!               inputCallback,NULL);
X      break;
X        case O_RDWR:
X!     ftpRegisteredFds[fd].readid =
X!         XtAppAddInput(appContext,fd,(XtPointer)XtInputReadMask,
X!               inputCallback,NULL);
X!     ftpRegisteredFds[fd].writeid =
X!         XtAppAddInput(appContext,fd,(XtPointer)XtInputWriteMask,
X!               inputCallback,NULL);
X      break;
X      }
X!     DEBUG2("RegisterFtpFd: done: readid=0x%x, writeid=0x%x\n",
X!        ftpRegisteredFds[fd].readid,ftpRegisteredFds[fd].writeid);
X  }
X
X  /*
X***************
X*** 391,398 ****
X  int *source;
X  XtInputId *id;
X  {
X!     if (ftpRegisteredProcs[*source] != NULL) {
X!     (*(ftpRegisteredProcs[*source]))(ftpRegisteredContexts[*source]);
X      } else {
X      fprintf(stderr,"YOW! Callback for fd=%d not registered!\n",*source);
X  #ifdef DEBUG
X--- 408,415 ----
X  int *source;
X  XtInputId *id;
X  {
X!     if (ftpRegisteredFds[*source].proc != NULL) {
X!     (*(ftpRegisteredFds[*source].proc))(ftpRegisteredFds[*source].context);
X      } else {
X      fprintf(stderr,"YOW! Callback for fd=%d not registered!\n",*source);
X  #ifdef DEBUG
X***************
X*** 411,418 ****
X  FtpContext *ftpc;
X  int fd;
X  {
X!     DEBUG3("UnregisterFtpFd: ftpc=0x%x, fd=%d, id=0x%x\n",
X!        ftpc,fd,ftpRegisteredIds[fd]);
X      if (fd < 0 || fd >= NUMFDS) {
X      fprintf(stderr,"YOW! Attempt to unregister fd %d!\n",fd);
X  #ifdef DEBUG
X--- 428,434 ----
X  FtpContext *ftpc;
X  int fd;
X  {
X!     DEBUG2("UnregisterFtpFd: ftpc=0x%x, fd=%d\n",ftpc,fd);
X      if (fd < 0 || fd >= NUMFDS) {
X      fprintf(stderr,"YOW! Attempt to unregister fd %d!\n",fd);
X  #ifdef DEBUG
X***************
X*** 420,430 ****
X  #endif
X      return;
X      }
X!     if (ftpRegisteredIds[fd] != (XtInputId)NULL)
X!     XtRemoveInput(ftpRegisteredIds[fd]);
X!     ftpRegisteredIds[fd] = (XtInputId)NULL;
X!     ftpRegisteredProcs[fd] = NULL;
X!     ftpRegisteredContexts[fd] = NULL;
X      DEBUG0("UnregisterFtpFd: done\n");
X  }
X
X--- 436,451 ----
X  #endif
X      return;
X      }
X!     DEBUG2("UnregisterFtpFd: readid=0x%x, writeid=0x%x\n",
X!        ftpRegisteredFds[fd].readid,ftpRegisteredFds[fd].writeid);
X!     if (ftpRegisteredFds[fd].readid != (XtInputId)NULL)
X!     XtRemoveInput(ftpRegisteredFds[fd].readid);
X!     ftpRegisteredFds[fd].readid = (XtInputId)NULL;
X!     if (ftpRegisteredFds[fd].writeid != (XtInputId)NULL)
X!     XtRemoveInput(ftpRegisteredFds[fd].writeid);
X!     ftpRegisteredFds[fd].writeid = (XtInputId)NULL;
X!     ftpRegisteredFds[fd].proc = NULL;
X!     ftpRegisteredFds[fd].context = NULL;
X      DEBUG0("UnregisterFtpFd: done\n");
X  }
X
X*** ../xarchie-2.0.7/help-text1.h    Wed Jun 30 15:16:09 1993
X--- help-text1.h    Tue Jul 27 10:24:58 1993
X***************
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--- 2,8 ----
X  NULL,
X  "NAME\n",
X  "     xarchie - X11 browser interface  to\n",
X! "     archie, version 2.0.8\n",
X  "\n",
X  NULL,
X  "SYNOPSIS\n",
X*** ../xarchie-2.0.7/patchlevel.h    Wed Jun 30 14:53:44 1993
X--- patchlevel.h    Tue Jul 27 10:18:22 1993
X***************
X*** 10,17 ****
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--- 10,18 ----
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+  * Version 2.0.8: 27 Jul 1993
X   */
X
X  #undef BETA
X  #define VERSION        2.0
X! #define PATCHLEVEL    8
X*** ../xarchie-2.0.7/weight.c    Wed Jun 30 14:54:45 1993
X--- weight.c    Tue Jul 27 10:14:32 1993
X***************
X*** 8,13 ****
X--- 8,14 ----
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+  * 27 Jul 1993: Added weights for Israel, from [e-mail]
X   */
X
X  #include <stdio.h>
X***************
X*** 109,114 ****
X--- 110,122 ----
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+ /* For Israel, from [e-mail] */
X+     { "il", "1  il\n\
X+ 2   ch it\n\
X+ 10  uk dk nl fr fi se no eu.net\n\
X+ 20  de cs es\n\
X+ 50  edu com gov net mil us ca\n\
X  100 au nz jp" },
X  };
X
X*** ../xarchie-2.0.7/xarchie.man    Wed Jun 30 15:15:39 1993
X--- xarchie.man    Tue Jul 27 10:18:45 1993
X***************
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--- 24,30 ----
X  ..
X  .de }F
X  .. \}
X! .TH XARCHIE 1 "27 Jul 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*** 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--- 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.8
X  .SH SYNOPSIS
X  .na
X  .in +8n
X--
XGeorge Ferguson
XDept. of Computer Science       INET: [e-mail]
XUniversity of Rochester         VOX:  [phone]
XRochester  NY  14627-0226       FAX:  [phone]
X
END_OF_FILE
  if test 14398 -ne `wc -c <'xarchie.p2'`; then
    echo shar: \"'xarchie.p2'\" unpacked with wrong size!
  fi
  # end of 'xarchie.p2'
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+