Comment: These are patches to produce the Andrew component of the X.V11R4 distribution, patch level 3 Andrew-Patch: 3 Date: Mon, 29 Jan 90 14:11:39 -0500 (EST) Date-span: 90/1/12 15:19:27 through 90/1/29 12:50:47 Bugs addressed: 1127 Count of patched files: 126 SPECIAL PATCH NOTES: You must create the directory ./ams/msclients/vui/doc by hand before you can patch. RCS logs: Source file: config/andrew.rls Current version: 2.90 revision 2.90 date: 90/01/23 15:02:20; author: ghoti; state: Exp; lines added/del: 1/1 fix syntactic error which caused 'make dependAll' to fail Source file: ams/libs/cui/Imakefile Current version: 2.7 revision 2.7 date: 90/01/18 13:42:56; author: ghoti; state: Exp; lines added/del: 1/0 Added DependTarget() rule to Imakefile Source file: ams/libs/ms/prettyn.c Current version: 2.11 revision 2.11 date: 90/01/29 11:53:24; author: susan; state: Exp; lines added/del: 3/3 changed line 114 from int dummy, len; to int dummy = 0, len; per suggestions from NSB will fix bug that makes the caption sometimes lack a "from" address (happens freq. on SPARC) Source file: ams/msclients/cui/cui.c Current version: 2.29 revision 2.29 date: 90/01/26 12:27:17; author: susan; state: Exp; lines added/del: 4/4 fixed line 1583 (per request from NSB) changed <= to == caused error message on SPARC while reading .cuirc Source file: ams/msclients/vui/Imakefile Current version: 2.23 revision 2.23 date: 90/01/24 14:19:12; author: ghoti; state: Exp; lines added/del: 3/0 now has a subdirectory 'doc' for all the inprogram help Source file: ams/msclients/vui/doc/Imakefile Current version: 1.1 revision 1.1 date: 90/01/24 20:03:37; author: ghoti; state: Exp; Initial revision Source file: ams/msclients/vui/doc/mainpanel.hlp Current version: 1.1 revision 1.1 date: 90/01/24 20:03:49; author: ghoti; state: Exp; Initial revision Source file: atk/basics/x/xgraphic.c Current version: 1.8 revision 1.8 date: 90/01/26 13:01:54; author: susan; state: Exp; lines added/del: 5/5 applied patch that fixed bug which caused hc 2.1s to die Source file: atk/basics/x/xim.c Current version: 1.26 revision 1.26 date: 90/01/26 13:00:48; author: susan; state: Exp; lines added/del: 19/19 applied patch that fixed bug which caused hc 2.1s to die Source file: atk/basics/common/environ.c Current version: 2.5 revision 2.5 date: 90/01/26 12:40:39; author: susan; state: Exp; lines added/del: 6/6 applied patch submitted by outside user Source file: atk/basics/common/region.c Current version: 2.5 revision 2.5 date: 90/01/26 12:51:13; author: susan; state: Exp; lines added/del: 5/5 applied patch supplied by user that fixed bug Source file: atk/basics/common/im.doc Current version: 1.4 revision 1.4 date: 90/01/26 12:56:21; author: susan; state: Exp; lines added/del: 4/5 It didn't indocate that "im_SetInteractionEvent returned a struct event *, nor did it properly descrive when the event is triggered. Source file: atk/console/cmd/Imakefile Current version: 2.16 revision 2.16 date: 90/01/26 14:23:30; author: ghoti; state: Exp; lines added/del: 2/1 link against $(RESOLVLIB) for gethostbyname() if RESOLVLIB is not defined, it will pick it up from libc Source file: atk/console/consoles/Imakefile Current version: 2.6 revision 2.6 date: 90/01/26 14:26:29; author: ghoti; state: Exp; lines added/del: 9/3 improve installation procedures so that only those files which have changed get installed Source file: atk/console/lib/mailmonf.c Current version: 2.17 revision 2.17 date: 90/01/22 12:16:28; author: ghoti; state: Exp; lines added/del: 9/7 BUG: 1127 (a) don't bother doing the prefetch if it's already doing the 'mailfrom' (b) ignore EWOULDBLOCK errors during the prefetch Source file: atk/console/lib/setup.c Current version: 2.46 revision 2.46 date: 90/01/29 10:38:01; author: ghoti; state: Exp; lines added/del: 21/8 fixed attempt to free an allocated array - was causing malloc problems on vax_3 Source file: atk/extensions/deskey.c Current version: 1.4 revision 1.4 date: 90/01/26 12:35:34; author: susan; state: Exp; lines added/del: 0/1 removed include files that weren't needed applied patch that fixed bug reported by outside user Source file: atk/help/src/Imakefile Current version: 2.17 revision 2.17 date: 90/01/26 14:46:21; author: ghoti; state: Exp; lines added/del: 3/0 link helpa against $(RESOLVLIB) Source file: atk/help/src/helpdb.c Current version: 1.11 revision 1.11 date: 90/01/26 13:04:09; author: susan; state: Exp; lines added/del: 35/5 fixed so that help files that have upper case chars can be found. Source file: atk/ness/objects/nodeclss.c Current version: 1.2 revision 1.2 date: 90/01/29 11:42:27; author: wjh; state: Exp; lines added/del: 5/3 added "exit(0)" Source file: atk/raster/convert/convrast.c Current version: 2.8 revision 2.8 date: 90/01/26 14:41:04; author: susan; state: Exp; lines added/del: 4/4 need to apply patch that changes rindex==null to ext==null since rindex is a function name and it will never be null. The effect of this bug will be that if the output file does not have an extension, it will not print the error message, but will go right ahead and try to compare the null string ext with something. On suns, this produces a core dump. Source file: atk/rofftext/roffstyl.c Current version: 2.9 revision 2.9 date: 90/01/26 13:07:14; author: susan; state: Exp; lines added/del: 18/3 In atk/rofftext/roffstyl.c the function environment_InsertStyle is called with a union, when it is expecting one of the union members. This is not allowed on the SPARC. It causes rofftext to coredump on sun4. Source file: atk/zip/lib/zipve02.c Current version: 2.13 revision 2.13 date: 90/01/26 13:11:08; author: susan; state: Exp; lines added/del: 10/5 sprintf used to return the pointer to the string it assembled. now it returns int. Source file: atk/zip/lib/zipve03.c Current version: 2.13 revision 2.13 date: 90/01/26 13:11:49; author: susan; state: Exp; lines added/del: 7/5 sprintf used to return the pointer to the string it assembled. now it returns int. Source file: overhead/pobbconf/pobbconf.c Current version: 1.60 revision 1.60 date: 90/01/22 11:19:52; author: ghoti; state: Exp; lines added/del: 1/1 fix syntactic typo ---------------------------- revision 1.59 date: 90/01/15 10:48:06; author: pierette; state: Exp; lines added/del: 2/5 added Macadvisor to polling on BB3 (LocalHigh). Removed org.acad-services.{vaxlib,vmsnotes,vaxannounce}. Source file: overhead/pobbconf/config.awk.pobb Current version: 1.32 revision 1.32 date: 90/01/16 17:36:03; author: pierette; state: Exp; lines added/del: 1/1 "stalled" WPbuild on PO machines so it can run in peace on patterson. Disable this by removing the word "stalled" from this file and removing the cron job from patterson. *** patchlevel.h Wed Jan 17 16:35:13 1990 --- patchlevel.h.NEW Mon Jan 29 13:11:49 1990 *************** *** 1 **** ! This is the Andrew component of the X.V11R4 distribution, patch level 2 --- 1 ---- ! This is the Andrew component of the X.V11R4 distribution, patch level 3 No differences encountered *** config/andrew.rls Fri Dec 8 11:34:15 1989 --- config/andrew.rls.NEW Mon Jan 29 12:51:16 1990 *************** *** 756,762 **** #define DependMakeSubdirs(dirs) @@\ dependAll:: @@\ ! @)case '$(MFLAGS)' in *[ik]*) set +e;; esac; \ @@\ for i in dirs; do \ @@\ (cd $$i; echo "depend/making (`pwd`)"; \ @@\ $(MAKE) $(MFLAGS) dependAll) done) --- 756,762 ---- #define DependMakeSubdirs(dirs) @@\ dependAll:: @@\ ! @(case '$(MFLAGS)' in *[ik]*) set +e;; esac; \ @@\ for i in dirs; do \ @@\ (cd $$i; echo "depend/making (`pwd`)"; \ @@\ $(MAKE) $(MFLAGS) dependAll) done) *** ams/libs/cui/Imakefile Wed Nov 22 11:31:09 1989 --- ams/libs/cui/Imakefile.NEW Mon Jan 29 12:52:07 1990 *************** *** 11,15 **** --- 11,16 ---- NormalObjectRule() LibraryTarget(${PRODUCT}, ${OBJS}) InstallLibrary(${PRODUCT}, ${DESTDIR}/lib/) + DependTarget() InstallDocs(CuiLib.pgr, ${DESTDIR}/doc/ams) *** ams/libs/ms/prettyn.c Wed Nov 22 11:34:35 1989 --- ams/libs/ms/prettyn.c.NEW Mon Jan 29 12:52:57 1990 *************** *** 3,10 **** * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ /* ! $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/ams/libs/ms/RCS/prettyn.c,v 2.10 89/02/17 18:58:48 ghoti Exp $ ! $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/ams/libs/ms/RCS/prettyn.c,v $ */ #include #include --- 3,10 ---- * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ /* ! $Header: /afs/andrew.cmu.edu/itc/src/andrew/ams/libs/ms/RCS/prettyn.c,v 2.11 90/01/29 11:53:24 susan Exp $ ! $Source: /afs/andrew.cmu.edu/itc/src/andrew/ams/libs/ms/RCS/prettyn.c,v $ */ #include #include *************** *** 111,117 **** char *MyFromBuf, *FromBuf; { char *RealFrom, *s, *oparen, *cparen; ! int dummy, len; PARSED_ADDRESS *Addr, *ListHead; debug(1, ("Finding prettiest in %s\n", MyFromBuf)); --- 111,117 ---- char *MyFromBuf, *FromBuf; { char *RealFrom, *s, *oparen, *cparen; ! int dummy = 0, len; PARSED_ADDRESS *Addr, *ListHead; debug(1, ("Finding prettiest in %s\n", MyFromBuf)); *** ams/msclients/cui/cui.c Wed Jan 17 16:36:04 1990 --- ams/msclients/cui/cui.c.NEW Mon Jan 29 12:53:18 1990 *************** *** 2,8 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/ams/msclients/cui/RCS/cui.c,v 2.28 89/12/18 10:59:56 cfe Exp $ */ /* $ACIS: $ */ /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/ams/msclients/cui/RCS/cui.c,v $ */ --- 2,8 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/ams/msclients/cui/RCS/cui.c,v 2.29 90/01/26 12:27:17 susan Exp $ */ /* $ACIS: $ */ /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/ams/msclients/cui/RCS/cui.c,v $ */ *************** *** 10,16 **** #define CUIP_MIN_VER 0 #ifndef NO_DUPLICATE_STATIC_CHARS ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/ams/msclients/cui/RCS/cui.c,v 2.28 89/12/18 10:59:56 cfe Exp $ "; #endif /* NO_DUPLICATE_STATIC_CHARS */ --- 10,16 ---- #define CUIP_MIN_VER 0 #ifndef NO_DUPLICATE_STATIC_CHARS ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/ams/msclients/cui/RCS/cui.c,v 2.29 90/01/26 12:27:17 susan Exp $ "; #endif /* NO_DUPLICATE_STATIC_CHARS */ *************** *** 1580,1586 **** char *s; debug(1,("GetNextCommand\n")); ! if ((long) *sptr <= 0) return(-1); debug(2,("Looking through %s for next command\n", *sptr)); --- 1580,1586 ---- char *s; debug(1,("GetNextCommand\n")); ! if ((long) *sptr == 0) return(-1); debug(2,("Looking through %s for next command\n", *sptr)); *** ams/msclients/vui/Imakefile Wed Nov 22 11:38:07 1989 --- ams/msclients/vui/Imakefile.NEW Mon Jan 29 12:53:32 1990 *************** *** 2,7 **** --- 2,10 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ + #define IHaveSubdirs + SUBDIRS = doc + LOCALINCLUDES = -I${BASEDIR}/include/ams #ifdef SNAP_ENV *** ams/msclients/vui/doc/Imakefile Mon Jan 29 13:47:02 1990 --- ams/msclients/vui/doc/Imakefile.NEW Mon Jan 29 12:54:13 1990 *************** *** 0 **** --- 1,16 ---- + DIRS = $(DESTDIR)/doc/inprogram \ + $(DESTDIR)/doc/inprogram/vui \ + $(DESTDIR)/doc/inprogram/vui/help + + /* The number of subdirectories is historical, and may eventually be + changed, but it is highly dependent upon a PC diskette distribution which is + more work to change than a normal UNIX distribution */ + + DOCS = *.hlp + + MkdirTarget($(DIRS)) + + InstallMultiple($(DOCS), $(INSTINCFLAGS), $(DESTDIR)/doc/inprogram/vui/help/) + + + *** ams/msclients/vui/doc/mainpanel.hlp Mon Jan 29 13:48:29 1990 --- ams/msclients/vui/doc/mainpanel.hlp.NEW Mon Jan 29 12:54:17 1990 *************** *** 0 **** --- 1,51 ---- + + Main Panel Help VUI Help + + To run various features of VUI, you select the command by pressing the first + letter of one of the command words at the bottom of the screen. If two or + more words have the same first letter, repeat the letter and you will move to + the next word. Now press enter to run this command. + + The main features of VUI allow you to read and send mail, read and send + bulletin board messages, and manage your own set of personal folders for + storing copies of important messages. + + Mail + VUI allows you to send mail to other Andrew users as well as to users of many + other systems both on and off campus. + + When your Andrew account was created, an electronic mail box was created for + you. The Mail reading feature of VUI checks for and retrieves incoming mail + from your mailbox and places it into an in-basket for you. The in-basket is a + special system folder called "mail". VUI provides a set of commands so that + you can read, print, save and reply to all of the mail you receive. + + Personal Folders + You can create your own set of personal folders to store important messages + instead of leaving them in your in-basket, the mail folder. You can also copy + messages from the bulletin boards and store the copies in your folders. + Later, if you decide to reorganize your folders, you can move messages from + one folder to another and rename the folders if you wish. + + Bulletin Boards + VUI also gives you access to hundreds of local, national and international + electronic bulletin boards which cover a vast range of subjects. You can use + VUI to subscribe to, read, file or print messages from any of these bulletin + boards. You can also post your own messages, forward messages to other users, + and store important items into one of your personal folders. + + Send + This feature helps you compose and send a message, either to another user or + to a bulletin board. + + Options + The Option Settings screen can be used to customize three features of the + program: header filtering, blind copies of your outgoing mail, and the editor + that you use in the Message Entry Screen. For more information about the + Option Settings commands, go to that screen and consult the online Help system. + + Help + This command shows you this text. + + Exit + Selecting this command lets you stop executing this program. *** atk/basics/x/xgraphic.c Wed Jan 17 16:36:42 1990 --- atk/basics/x/xgraphic.c.NEW Mon Jan 29 12:57:32 1990 *************** *** 2,15 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/.andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xgraphic.c,v 1.7 89/04/24 11:17:38 wjh Exp $ */ /* $ACIS:graphic.c 1.11$ */ ! /* $Source: /afs/.andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xgraphic.c,v $ */ #ifndef LINT ! char xgraphic_rcsid[] = "$Header: /afs/.andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xgraphic.c,v 1.7 89/04/24 11:17:38 wjh Exp $"; #endif /* LINT */ /* graphic.c --- 2,15 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xgraphic.c,v 1.8 90/01/26 13:01:54 susan Exp $ */ /* $ACIS:graphic.c 1.11$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xgraphic.c,v $ */ #ifndef LINT ! char xgraphic_rcsid[] = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xgraphic.c,v 1.8 90/01/26 13:01:54 susan Exp $"; #endif /* LINT */ /* graphic.c *************** *** 837,843 **** /* oh well, let's download the gray pattern */ XSetTile(xgraphic_XDisplay(self), self->localFillGraphicContext, ! Tile->localWindow,0,0); self->lastFillTile = self->gray_shades[grayIndex]; } } --- 837,843 ---- /* oh well, let's download the gray pattern */ XSetTile(xgraphic_XDisplay(self), self->localFillGraphicContext, ! Tile->localWindow); self->lastFillTile = self->gray_shades[grayIndex]; } } *************** *** 851,857 **** /* And let's send down the tile */ XSetTile(xgraphic_XDisplay(self), self->localFillGraphicContext, ! Tile->localWindow,0,0); self->lastFillTile = Tile; } --- 851,857 ---- /* And let's send down the tile */ XSetTile(xgraphic_XDisplay(self), self->localFillGraphicContext, ! Tile->localWindow); self->lastFillTile = Tile; } *** atk/basics/x/xim.c Wed Jan 17 16:36:50 1990 --- atk/basics/x/xim.c.NEW Mon Jan 29 12:57:40 1990 *************** *** 2,13 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xim.c,v 1.25 89/12/12 14:59:26 ghoti Exp $ */ /* $ACIS:im.c 1.6$ */ /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xim.c,v $ */ #ifndef lint ! char *xim_rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xim.c,v 1.25 89/12/12 14:59:26 ghoti Exp $"; #endif /* lint */ /* Put in error messages for handling of keystrokes. --- 2,13 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xim.c,v 1.26 90/01/26 13:00:48 susan Exp $ */ /* $ACIS:im.c 1.6$ */ /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xim.c,v $ */ #ifndef lint ! char *xim_rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/x/RCS/xim.c,v 1.26 90/01/26 13:00:48 susan Exp $"; #endif /* lint */ /* Put in error messages for handling of keystrokes. *************** *** 235,241 **** char fontPath[256]; /* Place where new fnot path will be built */ char *andrewDir; /* Returned value of ANDREWDIR */ char **fontPathList; /* Return list of directories */ ! long numPaths; /* Number of returned directories */ int i; /* Index into font path list */ /* First get what is suposed to be the "correct" andrew font path, which is --- 235,241 ---- char fontPath[256]; /* Place where new fnot path will be built */ char *andrewDir; /* Returned value of ANDREWDIR */ char **fontPathList; /* Return list of directories */ ! int numPaths; /* Number of returned directories */ int i; /* Index into font path list */ /* First get what is suposed to be the "correct" andrew font path, which is *************** *** 332,338 **** gethostname(WMName, sizeof(WMName)); XChangeProperty(display, window, XA_WM_CLIENT_MACHINE, XA_STRING, ! 8, PropModeReplace, WMName, strlen(WMName)); } static int FirstTimeThrough = TRUE; --- 332,338 ---- gethostname(WMName, sizeof(WMName)); XChangeProperty(display, window, XA_WM_CLIENT_MACHINE, XA_STRING, ! 8, PropModeReplace, (unsigned char *)WMName, strlen(WMName)); } static int FirstTimeThrough = TRUE; *************** *** 346,352 **** #define CONSPORT 2018 /* to avoid getservbyname calls */ #endif /* USEGETSERV */ ! void XErrorsToConsole(DisplayPtr, ErrorBlock) Display * DisplayPtr; XErrorEvent * ErrorBlock; { XGetErrorText(DisplayPtr,ErrorBlock->error_code,ErrMsg,sizeof(ErrMsg)); --- 346,352 ---- #define CONSPORT 2018 /* to avoid getservbyname calls */ #endif /* USEGETSERV */ ! int XErrorsToConsole(DisplayPtr, ErrorBlock) Display * DisplayPtr; XErrorEvent * ErrorBlock; { XGetErrorText(DisplayPtr,ErrorBlock->error_code,ErrMsg,sizeof(ErrMsg)); *************** *** 508,514 **** GeometryPosition = FALSE; if (geometrySpec != NULL) { ! int mask, x, y, width, height; mask = XParseGeometry(geometrySpec, &x, &y, &width, &height); if (mask & (XValue | YValue)) { GeometryPosition = TRUE; --- 508,514 ---- GeometryPosition = FALSE; if (geometrySpec != NULL) { ! int mask, x, y;unsigned int width, height; mask = XParseGeometry(geometrySpec, &x, &y, &width, &height); if (mask & (XValue | YValue)) { GeometryPosition = TRUE; *************** *** 745,751 **** for (thisBinding = keybindings; thisBinding < keybindings + sizeof(keybindings) / sizeof(struct keybinding); thisBinding++) ! XRebindKeysym(xDisplay, thisBinding->key, NULL, 0, thisBinding->binding, 2); /* New display, so see if someone has bothered to define the cut buffers yet! */ if (xim_ATK == NULL) { --- 745,751 ---- for (thisBinding = keybindings; thisBinding < keybindings + sizeof(keybindings) / sizeof(struct keybinding); thisBinding++) ! XRebindKeysym(xDisplay, thisBinding->key, NULL, 0, (unsigned char *)thisBinding->binding, 2); /* New display, so see if someone has bothered to define the cut buffers yet! */ if (xim_ATK == NULL) { *************** *** 762,768 **** Atom RetAtom; int RetFormat; unsigned long RetNumItems; ! long RetBytesAfter; unsigned char * RetData = NULL; static Atom n_to_atom[8] = { XA_CUT_BUFFER0, --- 762,768 ---- Atom RetAtom; int RetFormat; unsigned long RetNumItems; ! unsigned long RetBytesAfter; unsigned char * RetData = NULL; static Atom n_to_atom[8] = { XA_CUT_BUFFER0, *************** *** 779,785 **** /* I'll take any kind of cut buffer!*/ AnyPropertyType, &RetAtom, &RetFormat, &RetNumItems, &RetBytesAfter, &RetData); if (RetAtom == None) ! XStoreBuffer(xDisplay, &RetNumItems, 0, i); if (RetData) free(RetData); } --- 779,785 ---- /* I'll take any kind of cut buffer!*/ AnyPropertyType, &RetAtom, &RetFormat, &RetNumItems, &RetBytesAfter, &RetData); if (RetAtom == None) ! XStoreBuffer(xDisplay, (char *)&RetNumItems, 0, i); if (RetData) free(RetData); } *************** *** 1529,1535 **** Window exposedWindow; long lastSeenWidth, lastSeenHeight; Region newUpdateRgn, windowRgn; ! long x, y, width, height, border, depth; Drawable root; /* initialize all variables */ --- 1529,1535 ---- Window exposedWindow; long lastSeenWidth, lastSeenHeight; Region newUpdateRgn, windowRgn; ! int x, y; unsigned int width, height, border, depth; Drawable root; /* initialize all variables */ *************** *** 1738,1744 **** do { /* while (XPending(display)) */ /* get the next event*/ ! XNextEvent(display, (struct XEvent *) &event); lastEventTime = CurrentTime; /* in case there's no time in this particular event */ event.type &= 0177; /* Mask out high order bit, which distinguishes between server generated events --- 1738,1744 ---- do { /* while (XPending(display)) */ /* get the next event*/ ! XNextEvent(display, &event); lastEventTime = CurrentTime; /* in case there's no time in this particular event */ event.type &= 0177; /* Mask out high order bit, which distinguishes between server generated events *************** *** 1966,1972 **** (we need some way to slow it down. sigh, what a notion) */ XSync(xim2display(im), 0); while(XPending(xim2display(im))) { ! XNextEvent(xim2display(im), (struct XEvent *)&tempEvent); if (tempEvent.type == MotionNotify) { if (mf) { --- 1966,1972 ---- (we need some way to slow it down. sigh, what a notion) */ XSync(xim2display(im), 0); while(XPending(xim2display(im))) { ! XNextEvent(xim2display(im), &tempEvent); if (tempEvent.type == MotionNotify) { if (mf) { *************** *** 2646,2652 **** Window window = RootWindow(display, xim2screen(self)); XEvent event; ! static char junk[] = ""; if (lastEventTime == CurrentTime) { SetPNMask(display, window); --- 2646,2652 ---- Window window = RootWindow(display, xim2screen(self)); XEvent event; ! static unsigned char junk[] = ""; if (lastEventTime == CurrentTime) { SetPNMask(display, window); *************** *** 2809,2815 **** } else while (TRUE) { /* okay, we've got to loop to get the rest (sigh) */ ! appendtostring(cb, data, nitems * (actualformat >> 3)); if (remainingbytes == 0) return TRUE; offset += maxlen; --- 2809,2815 ---- } else while (TRUE) { /* okay, we've got to loop to get the rest (sigh) */ ! appendtostring(cb, (char *)data, nitems * (actualformat >> 3)); if (remainingbytes == 0) return TRUE; offset += maxlen; *************** *** 2868,2874 **** for (j = 0; j < nitems && target == None; j++) if (DesirableTargets[i] == ((Atom *)propList)[j]) target = DesirableTargets[i]; ! XFree(propList); if (target == None) break; /* okay, we'll ask for the selection in type 'target' */ --- 2868,2874 ---- for (j = 0; j < nitems && target == None; j++) if (DesirableTargets[i] == ((Atom *)propList)[j]) target = DesirableTargets[i]; ! XFree((caddr_t)propList); if (target == None) break; /* okay, we'll ask for the selection in type 'target' */ *************** *** 3229,3235 **** NotificationEvent.time = req->time; XSendEvent(req->display, req->requestor, ! FALSE, NoEventMask, &NotificationEvent); } --- 3229,3235 ---- NotificationEvent.time = req->time; XSendEvent(req->display, req->requestor, ! FALSE, NoEventMask, (XEvent *)&NotificationEvent); } *************** *** 3421,3427 **** cmsg.data.l[0] = IconicState; XSendEvent(xim2display(self), RootWindow(xim2display(self), xim2screen(self)), ! FALSE, (SubstructureRedirectMask | SubstructureNotifyMask), &cmsg); XFlush(xim2display(self)); self->CurrentlyMapped = FALSE; --- 3421,3427 ---- cmsg.data.l[0] = IconicState; XSendEvent(xim2display(self), RootWindow(xim2display(self), xim2screen(self)), ! FALSE, (SubstructureRedirectMask | SubstructureNotifyMask), (XEvent *)&cmsg); XFlush(xim2display(self)); self->CurrentlyMapped = FALSE; *************** *** 3445,3451 **** unmapnotify.send_event = TRUE; unmapnotify.from_configure = FALSE; XSendEvent(xim2display(self), unmapnotify.event, FALSE, ! (SubstructureRedirectMask | SubstructureNotifyMask), &unmapnotify); XFlush(xim2display(self)); self->CurrentlyMapped = FALSE; --- 3445,3451 ---- unmapnotify.send_event = TRUE; unmapnotify.from_configure = FALSE; XSendEvent(xim2display(self), unmapnotify.event, FALSE, ! (SubstructureRedirectMask | SubstructureNotifyMask), (XEvent *)&unmapnotify); XFlush(xim2display(self)); self->CurrentlyMapped = FALSE; *** atk/basics/common/environ.c Wed Nov 22 11:48:14 1989 --- atk/basics/common/environ.c.NEW Mon Jan 29 12:58:01 1990 *************** *** 4,15 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/basics/common/RCS/environ.c,v 2.4 89/02/17 18:36:00 ghoti Exp $ */ /* $ACIS:environ.c 1.4$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/basics/common/RCS/environ.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/basics/common/RCS/environ.c,v 2.4 89/02/17 18:36:00 ghoti Exp $"; #endif /* lint */ /* environ.c --- 4,15 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/common/RCS/environ.c,v 2.5 90/01/26 12:40:39 susan Exp $ */ /* $ACIS:environ.c 1.4$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/common/RCS/environ.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/common/RCS/environ.c,v 2.5 90/01/26 12:40:39 susan Exp $"; #endif /* lint */ /* environ.c *************** *** 177,192 **** char *environ__GetConfig(classID, cList, key, usedefault) struct classheader *classID; ! struct configurationlist *cList; char *key; boolean usedefault; { ! return (char *) GetConfig(key, usedefault); } void environ__FreeConfigureList(classID, cList) struct classheader *classID; ! struct configurationlist *cList; { FreeConfigureList(cList); } --- 177,192 ---- char *environ__GetConfig(classID, cList, key, usedefault) struct classheader *classID; ! struct configurelist *cList; char *key; boolean usedefault; { ! return (char *) GetConfig(cList, key, usedefault); } void environ__FreeConfigureList(classID, cList) struct classheader *classID; ! struct configurelist *cList; { FreeConfigureList(cList); } *** atk/basics/common/region.c Wed Nov 22 11:49:12 1989 --- atk/basics/common/region.c.NEW Mon Jan 29 12:58:03 1990 *************** *** 4,15 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/basics/common/RCS/region.c,v 2.4 89/02/17 18:40:14 ghoti Exp $ */ /* $ACIS:region.c 1.2$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/basics/common/RCS/region.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/basics/common/RCS/region.c,v 2.4 89/02/17 18:40:14 ghoti Exp $"; #endif /* lint */ #include --- 4,15 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/common/RCS/region.c,v 2.5 90/01/26 12:51:13 susan Exp $ */ /* $ACIS:region.c 1.2$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/common/RCS/region.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/basics/common/RCS/region.c,v 2.5 90/01/26 12:51:13 susan Exp $"; #endif /* lint */ #include *************** *** 72,78 **** rectPoint[3].x = rectangle_Left(NewRegnRect); rectPoint[3].y = rectangle_Bottom(NewRegnRect); if (self->regionData) XDestroyRegion(self->regionData); ! self->regionData = XPolygonRegion(5, rectPoint, EvenOddRule); } struct region * region__DuplicateRegion(self) --- 72,78 ---- rectPoint[3].x = rectangle_Left(NewRegnRect); rectPoint[3].y = rectangle_Bottom(NewRegnRect); if (self->regionData) XDestroyRegion(self->regionData); ! self->regionData = XPolygonRegion(rectPoint, 5, EvenOddRule); } struct region * region__DuplicateRegion(self) *************** *** 169,175 **** retValue = region_New(); XDestroyRegion(retValue->regionData); ! retValue->regionData = XPolygonRegion(PointCount+1, polyPts, EvenOddRule); free(polyPts); return retValue; } --- 169,175 ---- retValue = region_New(); XDestroyRegion(retValue->regionData); ! retValue->regionData = XPolygonRegion(polyPts, PointCount+1, EvenOddRule); free(polyPts); return retValue; } *** atk/basics/common/im.doc Fri Dec 8 12:34:06 1989 --- atk/basics/common/im.doc.NEW Mon Jan 29 12:58:10 1990 *************** *** 580,586 **** \paragraph{Setting an interaction event}\indexi{Interaction manager++Setting an interaction event} \indexi{ \italic{im_SetInteractionEvent}} ! \example{void im_SetInteractionEvent (im, interactionFunction, interactionData, timeIncrement) struct im *im; --- 580,586 ---- \paragraph{Setting an interaction event}\indexi{Interaction manager++Setting an interaction event} \indexi{ \italic{im_SetInteractionEvent}} ! \example{struct event *im_SetInteractionEvent (im, interactionFunction, interactionData, timeIncrement) struct im *im; *************** *** 593,602 **** \leftindent{\bold{Method description. } \italic{im_SetInteractionEvent ! } sets up an interaction event. The interactionFunction will be called with ! the parameter interactionData when either a user interaction (mouse hit, ! key-stroke or menu selection) occurs, or after timeIncrement seconds, which ! ever comes first. \bold{Usage.} Be careful with this function. Because Toolkit objects are do --- 593,601 ---- \leftindent{\bold{Method description. } \italic{im_SetInteractionEvent ! } sets up an interaction event. After a delay of timeIncrement seconds, the ! interactionFunction will be called with the parameter interactionData when the ! next user interaction (mouse hit, key-stroke or menu selection) occurs. \bold{Usage.} Be careful with this function. Because Toolkit objects are do *** atk/console/cmd/Imakefile Wed Nov 22 11:55:36 1989 --- atk/console/cmd/Imakefile.NEW Mon Jan 29 12:58:39 1990 *************** *** 17,23 **** $(BASEDIR)/lib/atk/libtext.a \ ../lib/libconsole.a \ $(BASEDIR)/lib/liberrors.a \ ! $(UTILLIB) NormalObjectRule() NormalATKRule() --- 17,24 ---- $(BASEDIR)/lib/atk/libtext.a \ ../lib/libconsole.a \ $(BASEDIR)/lib/liberrors.a \ ! $(UTILLIB) \ ! $(RESOLVLIB) NormalObjectRule() NormalATKRule() *** atk/console/consoles/Imakefile Wed Nov 22 11:55:47 1989 --- atk/console/consoles/Imakefile.NEW Mon Jan 29 12:58:45 1990 *************** *** 2,10 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! InstallMultipleByExtension(con, $(INSTINCFLAGS), $(DESTDIR)/lib/consoles) ! InstallMultipleByExtension(vop, $(INSTINCFLAGS), $(DESTDIR)/lib/consoles) ! InstallMultipleByExtension(rou, $(INSTINCFLAGS), $(DESTDIR)/lib/consoles) #ifndef CMU_ENV InstallFileToFile(default.xcn, $(INSTINCFLAGS), $(DESTDIR)/lib/consoles/default.con) #endif /* CMU_ENV */ --- 2,16 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! CONS = *.con ! ! InstallMultiple($(CONS), $(INSTINCFLAGS), $(DESTDIR)/lib/consoles) ! ! #ifdef AFS_ENV ! VOPS = *.vop ! InstallMultiple($(VOPS), $(INSTINCFLAGS), $(DESTDIR)/lib/consoles) ! #endif /* AFS_ENV */ ! #ifndef CMU_ENV InstallFileToFile(default.xcn, $(INSTINCFLAGS), $(DESTDIR)/lib/consoles/default.con) #endif /* CMU_ENV */ *** atk/console/lib/mailmonf.c Wed Nov 22 11:57:30 1989 --- atk/console/lib/mailmonf.c.NEW Mon Jan 29 12:58:57 1990 *************** *** 2,12 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/console/lib/RCS/mailmonf.c,v 2.16 89/10/20 17:10:32 cfe Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/console/lib/RCS/mailmonf.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/console/lib/RCS/mailmonf.c,v 2.16 89/10/20 17:10:32 cfe Exp $"; #endif /* lint */ /* *************************************************************** --- 2,12 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/mailmonf.c,v 2.17 90/01/22 12:16:28 ghoti Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/mailmonf.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/mailmonf.c,v 2.17 90/01/22 12:16:28 ghoti Exp $"; #endif /* lint */ /* *************************************************************** *************** *** 374,383 **** if (CheckMyMail){ ParseMail(self, fullname, requested); } ! if (pioctl(fullname, VIOCPREFETCH, &blob)) { ! if ((errno != ENOENT)&&(errno != EBUSY)&&(errno != EACCES)){ ! sprintf(ErrTxt, "console: Cannot pre-fetch your new mail %s (error %d); sorry...", fullname, errno); ! ReportInternalError(self, ErrTxt); } } } --- 374,385 ---- if (CheckMyMail){ ParseMail(self, fullname, requested); } ! else { ! if (pioctl(fullname, VIOCPREFETCH, &blob)) { ! if ((errno != ENOENT) && (errno != EBUSY) && (errno != EACCES) && (errno != EWOULDBLOCK)){ ! sprintf(ErrTxt, "console: Cannot pre-fetch your new mail %s (error %d); sorry...", fullname, errno); ! ReportInternalError(self, ErrTxt); ! } } } } *** atk/console/lib/setup.c Wed Jan 17 16:37:15 1990 --- atk/console/lib/setup.c.NEW Mon Jan 29 12:59:02 1990 *************** *** 2,12 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/.andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/setup.c,v 2.45 89/11/22 13:19:54 cfe Exp $ */ ! /* $Source: /afs/.andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/setup.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/.andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/setup.c,v 2.45 89/11/22 13:19:54 cfe Exp $"; #endif /* lint */ /* --- 2,12 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/setup.c,v 2.46 90/01/29 10:38:01 ghoti Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/setup.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/console/lib/RCS/setup.c,v 2.46 90/01/29 10:38:01 ghoti Exp $"; #endif /* lint */ /* *************** *** 987,993 **** { #define MAXTRIES 5 FILE *pfd =NULL ; ! char *theTypeInPtr = NULL; char theTypedInput[MAXPATHLEN]; int maxtries = 1; boolean theFirstPass = TRUE; --- 987,993 ---- { #define MAXTRIES 5 FILE *pfd =NULL ; ! char *theTypeInPtr = NULL, *tmp = NULL; char theTypedInput[MAXPATHLEN]; int maxtries = 1; boolean theFirstPass = TRUE; *************** *** 1064,1070 **** } } } ! if ((theTypeInPtr = FindConsoleInPaths(theTypeInPtr)) == NULL) { pfd = NULL; /* obviously */ }else { if (theTypeInPtr != NULL) { --- 1064,1075 ---- } } } ! if ((tmp = FindConsoleInPaths(theTypeInPtr)) != NULL) ! strcpy(theTypeInPtr,tmp); ! else ! theTypeInPtr = NULL; ! ! if (theTypeInPtr == NULL) { pfd = NULL; /* obviously */ }else { if (theTypeInPtr != NULL) { *************** *** 1090,1096 **** { struct display *thisdisp; int *newchild; ! char *s, *TokenBuf, *string; char *theTypeInPtr = NULL; char DEFAULTFILE[50]; FILE *pfd = NULL; --- 1095,1101 ---- { struct display *thisdisp; int *newchild; ! char *s, *TokenBuf, *string, *tmp = NULL; char *theTypeInPtr = NULL; char DEFAULTFILE[50]; FILE *pfd = NULL; *************** *** 1140,1146 **** bzero(theTypeInPtr, MAXPATHLEN); strcpy(theTypeInPtr, ConFile); } ! theTypeInPtr = FindConsoleInPaths(theTypeInPtr); if(theTypeInPtr != NULL) { strcpy(ConFile, theTypeInPtr); free(theTypeInPtr); --- 1145,1155 ---- bzero(theTypeInPtr, MAXPATHLEN); strcpy(theTypeInPtr, ConFile); } ! if ((tmp = FindConsoleInPaths(theTypeInPtr)) != NULL) ! strcpy(theTypeInPtr,tmp); ! else ! theTypeInPtr = NULL; ! if(theTypeInPtr != NULL) { strcpy(ConFile, theTypeInPtr); free(theTypeInPtr); *************** *** 1158,1164 **** bzero(theTypeInPtr, MAXPATHLEN); strcpy(theTypeInPtr, ConFile); } ! theTypeInPtr = FindConsoleInPaths(theTypeInPtr); if(theTypeInPtr != NULL) { strcpy(ConFile, theTypeInPtr); free(theTypeInPtr); --- 1167,1177 ---- bzero(theTypeInPtr, MAXPATHLEN); strcpy(theTypeInPtr, ConFile); } ! if ((tmp = FindConsoleInPaths(theTypeInPtr)) != NULL) ! strcpy(theTypeInPtr,tmp); ! else ! theTypeInPtr = NULL; ! if(theTypeInPtr != NULL) { strcpy(ConFile, theTypeInPtr); free(theTypeInPtr); *** atk/extensions/deskey.c Wed Jan 17 16:37:35 1990 --- atk/extensions/deskey.c.NEW Mon Jan 29 13:01:29 1990 *************** *** 4,10 **** \* ********************************************************************** */ #include - #include /* ams_genid */ #include #include #include --- 4,9 ---- *** atk/help/src/Imakefile Wed Nov 22 12:14:47 1989 --- atk/help/src/Imakefile.NEW Mon Jan 29 13:01:48 1990 *************** *** 12,18 **** --- 12,21 ---- InstallFile(helpmac.an, $(INSTINCFLAGS), $(DESTDIR)/lib/tmac) + DynamicMultiObject(helpa.do, helpa.o, $(RESOLVLIB),) + DynamicMultiObject(helpdb.do, helpdb.o, ${BASEDIR}/lib/libindex.a,) + DynamicMultiObject(help.do, help.o, ${BASEDIR}/lib/librxp.a,) InstallClassFiles($(DOBJS),$(IHFILES)) *** atk/help/src/helpdb.c Wed Nov 22 12:14:56 1989 --- atk/help/src/helpdb.c.NEW Mon Jan 29 13:01:51 1990 *************** *** 2,15 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/help/src/RCS/helpdb.c,v 1.10 89/10/04 19:12:41 cfe Exp $ */ /* $ACIS$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/help/src/RCS/helpdb.c,v $ */ #if !defined(lint) && !defined(LOCORE) && defined(RCS_HDRS) ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/help/src/RCS/helpdb.c,v 1.10 89/10/04 19:12:41 cfe Exp $"; #endif /* !defined(lint) && !defined(LOCORE) && defined(RCS_HDRS) */ /*---------------------------------------------------------------------------*/ /* MODULE: helpdb.c */ /* Package of routines to do the index-related lookups and */ --- 2,23 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/help/src/RCS/helpdb.c,v 1.11 90/01/26 13:04:09 susan Exp $ */ /* $ACIS$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/help/src/RCS/helpdb.c,v $ */ #if !defined(lint) && !defined(LOCORE) && defined(RCS_HDRS) ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/help/src/RCS/helpdb.c,v 1.11 90/01/26 13:04:09 susan Exp $"; #endif /* !defined(lint) && !defined(LOCORE) && defined(RCS_HDRS) */ + #ifdef CCH + /* Modified 1/19/90 CCH cch@mtgzx.att.com + * Fixed so that help files that have upper case charactrers can be found. + * The name being searched for is lowercased in help.c, but when it is + * looking for a man file, it does not lowercase the filenames. + */ + #endif + /*---------------------------------------------------------------------------*/ /* MODULE: helpdb.c */ /* Package of routines to do the index-related lookups and */ *************** *** 645,650 **** --- 653,675 ---- } + #define CCH + #ifdef CCH + static char *LowerCase(astring) + register char *astring; + { + register char *tp = astring; + + while (tp && *tp != NULL) + if (isupper(*tp)) { + *tp = tolower(*tp); + tp++; + } else + tp++; + return astring; + } + #endif + /* * Given a directory path "dname", adds all files in that directory * that match topic "aname" to the list "tmplist". *************** *** 671,679 **** while((tde=readdir(tempdir)) != NULL) { struct stat buf; ! if (!Match(aname, tde->d_name, 1)) continue; ! /* don't add directories */ strcpy(tfp, tde->d_name); /* finish the filename */ if ((stat(tfn, &buf) != 0) || (buf.st_mode & S_IFDIR)) { --- 696,709 ---- while((tde=readdir(tempdir)) != NULL) { struct stat buf; ! #ifdef CCH ! char lfname[MAXPATHLEN]; ! strcpy(lfname, tde->d_name); ! LowerCase(lfname); ! if (!Match(aname, lfname, 1)) continue; ! #else if (!Match(aname, tde->d_name, 1)) continue; ! #endif /* don't add directories */ strcpy(tfp, tde->d_name); /* finish the filename */ if ((stat(tfn, &buf) != 0) || (buf.st_mode & S_IFDIR)) { *** atk/ness/objects/nodeclss.c Wed Nov 22 12:21:41 1989 --- atk/ness/objects/nodeclss.c.NEW Mon Jan 29 13:02:24 1990 *************** *** 1,11 **** /* ********************************************************************** *\ * Copyright IBM Corporation 1988,1989 - All Rights Reserved * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/ness/objects/RCS/nodeclss.c,v 1.1 89/09/19 10:23:37 wjh Exp $ */ /* $ACIS:$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/ness/objects/RCS/nodeclss.c,v $ */ #if !defined(lint) && !defined(LOCORE) && defined(RCS_HDRS) ! static char *nodeclass_h_rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/ness/objects/RCS/nodeclss.c,v 1.1 89/09/19 10:23:37 wjh Exp $"; #endif /* nodeclss.c --- 1,11 ---- /* ********************************************************************** *\ * Copyright IBM Corporation 1988,1989 - All Rights Reserved * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/ness/objects/RCS/nodeclss.c,v 1.2 90/01/29 11:42:27 wjh Exp $ */ /* $ACIS:$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/ness/objects/RCS/nodeclss.c,v $ */ #if !defined(lint) && !defined(LOCORE) && defined(RCS_HDRS) ! static char *nodeclass_h_rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/ness/objects/RCS/nodeclss.c,v 1.2 90/01/29 11:42:27 wjh Exp $"; #endif /* nodeclss.c *************** *** 226,229 **** --- 226,231 ---- /* bingo */ PutNodeClass(); else PutToken(); + + exit(0); } *** atk/raster/convert/convrast.c Wed Nov 22 12:25:29 1989 --- atk/raster/convert/convrast.c.NEW Mon Jan 29 13:02:49 1990 *************** *** 4,15 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/raster/convert/RCS/convrast.c,v 2.7 89/04/20 14:01:16 pgc Exp Locker: pgc $ */ /* $ACIS:convrast.c 1.4$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/raster/convert/RCS/convrast.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/raster/convert/RCS/convrast.c,v 2.7 89/04/20 14:01:16 pgc Exp Locker: pgc $"; #endif /* lint */ /* convrast.c - program to convert raster formats --- 4,15 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/raster/convert/RCS/convrast.c,v 2.8 90/01/26 14:41:04 susan Exp $ */ /* $ACIS:convrast.c 1.4$ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/raster/convert/RCS/convrast.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/raster/convert/RCS/convrast.c,v 2.8 90/01/26 14:41:04 susan Exp $"; #endif /* lint */ /* convrast.c - program to convert raster formats *************** *** 353,359 **** { unsigned char *ext = (unsigned char *)rindex(outname, '.'); if (*outname) { ! if (rindex == NULL) fail("Output filename must have an extension"); else switch (outType) { case typeraster: --- 353,359 ---- { unsigned char *ext = (unsigned char *)rindex(outname, '.'); if (*outname) { ! if (ext == NULL) fail("Output filename must have an extension"); else switch (outType) { case typeraster: *** atk/rofftext/roffstyl.c Wed Jan 17 16:38:41 1990 --- atk/rofftext/roffstyl.c.NEW Mon Jan 29 13:03:06 1990 *************** *** 2,13 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/rofftext/RCS/roffstyl.c,v 2.8 89/12/12 15:05:50 ghoti Exp $ */ /* $ACIS: $ */ /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/rofftext/RCS/roffstyl.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/rofftext/RCS/roffstyl.c,v 2.8 89/12/12 15:05:50 ghoti Exp $ "; #endif /* lint */ /* styles */ --- 2,13 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/rofftext/RCS/roffstyl.c,v 2.9 90/01/26 13:07:14 susan Exp $ */ /* $ACIS: $ */ /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/rofftext/RCS/roffstyl.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/rofftext/RCS/roffstyl.c,v 2.9 90/01/26 13:07:14 susan Exp $ "; #endif /* lint */ /* styles */ *************** *** 20,25 **** --- 20,32 ---- #include #include + /* + * fixed by cch@mtgzx.att.com 1/10/90 + * program calling environment_InsertStyle with union environmentcontents + * where it should be passing struct *style. + * This is a no-no on SPARC. + */ + #define CCH WriteText(self) struct rofftext *self; *************** *** 62,68 **** --- 69,79 ---- self->stack++; self->stack->pos = self->pos; data.style = self->tempstack->style; + #ifndef CCH self->stack->env = environment_InsertStyle((self->stack-1)->env, self->pos - (self->stack-1)->pos, data, TRUE); + #else + self->stack->env = environment_InsertStyle((self->stack-1)->env, self->pos - (self->stack-1)->pos, self->tempstack->style, TRUE); + #endif self->stack->level = (self->stack-1)->level+1; self->stack->ID = self->tempstack->ID; self->tempstack--; *************** *** 116,122 **** --- 127,137 ---- self->stack++; self->stack->pos = self->pos; data.style = style; + #ifndef CCH self->stack->env = environment_InsertStyle((self->stack-1)->env, self->pos - (self->stack-1)->pos, data, TRUE); + #else + self->stack->env = environment_InsertStyle((self->stack-1)->env, self->pos - (self->stack-1)->pos, style, TRUE); + #endif self->stack->level = (self->stack-1)->level+1; self->stack->ID = self->styleID++; *** atk/zip/lib/zipve02.c Wed Nov 22 12:40:32 1989 --- atk/zip/lib/zipve02.c.NEW Mon Jan 29 13:04:19 1990 *************** *** 2,12 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/zip/lib/RCS/zipve02.c,v 2.12 89/09/11 08:17:55 ghoti Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/zip/lib/RCS/zipve02.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/zip/lib/RCS/zipve02.c,v 2.12 89/09/11 08:17:55 ghoti Exp $"; #endif /* lint */ /* --- 2,12 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/zip/lib/RCS/zipve02.c,v 2.13 90/01/26 13:11:08 susan Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/zip/lib/RCS/zipve02.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/zip/lib/RCS/zipve02.c,v 2.13 90/01/26 13:11:08 susan Exp $"; #endif /* lint */ /* *************** *** 21,26 **** --- 21,30 ---- /* $Log: zipve02.c,v $ + * Revision 2.13 90/01/26 13:11:08 susan + * sprintf used to return the pointer to the string it assembled. + * now it returns int. + * * Revision 2.12 89/09/11 08:17:55 ghoti * fix enumeration type clashes - specifically those dealing with mouse actions * *************** *** 1106,1112 **** FontHeight += 2; else FontHeight = 2; ! zip_Set_Figure_Text( Data, figure, sprintf( msg, "%2d", FontHeight ) ); } else if ( action == view_RightDown ) --- 1110,1117 ---- FontHeight += 2; else FontHeight = 2; ! sprintf( msg, "%2d", FontHeight ); ! zip_Set_Figure_Text( Data, figure, msg); } else if ( action == view_RightDown ) *************** *** 1115,1121 **** FontHeight -= 2; else FontHeight = 144; ! zip_Set_Figure_Text( Data, figure, sprintf( msg, "%2d", FontHeight ) ); } zipview_Draw_Figure( View, figure, pane ); } --- 1120,1127 ---- FontHeight -= 2; else FontHeight = 144; ! sprintf( msg, "%2d", FontHeight ); ! zip_Set_Figure_Text( Data, figure, msg); } zipview_Draw_Figure( View, figure, pane ); } *** atk/zip/lib/zipve03.c Wed Nov 22 12:40:35 1989 --- atk/zip/lib/zipve03.c.NEW Mon Jan 29 13:04:24 1990 *************** *** 2,12 **** * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/zip/lib/RCS/zipve03.c,v 2.12 89/09/28 11:09:54 sg08 Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/zip/lib/RCS/zipve03.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/sm/releases/X.V11R4/andrew/atk/zip/lib/RCS/zipve03.c,v 2.12 89/09/28 11:09:54 sg08 Exp $"; #endif /* lint */ /* zipve03.c Zip EditView-object -- Hit Handling */ --- 2,12 ---- * Copyright IBM Corporation 1988,1989 - All Rights Reserved * * For full copyright information see:'andrew/config/COPYRITE' * \* ********************************************************************** */ ! /* $Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/zip/lib/RCS/zipve03.c,v 2.13 90/01/26 13:11:49 susan Exp $ */ ! /* $Source: /afs/andrew.cmu.edu/itc/src/andrew/atk/zip/lib/RCS/zipve03.c,v $ */ #ifndef lint ! static char *rcsid = "$Header: /afs/andrew.cmu.edu/itc/src/andrew/atk/zip/lib/RCS/zipve03.c,v 2.13 90/01/26 13:11:49 susan Exp $"; #endif /* lint */ /* zipve03.c Zip EditView-object -- Hit Handling */ *************** *** 1038,1049 **** zipobject_Object_Point( Objects(figure->zip_figure_type), figure, point, &X, &Y ); name_figure = zip_Figure( Data, ZIP_current_x_point_text_name ); zipview_Clear_Figure( View, name_figure, AttributesPane ); ! zip_Set_Figure_Text( Data, name_figure, sprintf( msg, "%d", X ) ); zipview_Draw_Figure( View, name_figure, AttributesPane ); name_figure = zip_Figure( Data, ZIP_current_y_point_text_name ); zipview_Clear_Figure( View, name_figure, AttributesPane ); ! zip_Set_Figure_Text( Data, name_figure, sprintf( msg, "%d", Y ) ); zipview_Draw_Figure( View, name_figure, AttributesPane ); } OUT(Show_Point); --- 1038,1051 ---- zipobject_Object_Point( Objects(figure->zip_figure_type), figure, point, &X, &Y ); name_figure = zip_Figure( Data, ZIP_current_x_point_text_name ); zipview_Clear_Figure( View, name_figure, AttributesPane ); ! sprintf( msg, "%d", X ); ! zip_Set_Figure_Text( Data, name_figure, msg); zipview_Draw_Figure( View, name_figure, AttributesPane ); name_figure = zip_Figure( Data, ZIP_current_y_point_text_name ); zipview_Clear_Figure( View, name_figure, AttributesPane ); ! sprintf( msg, "%d", Y ); ! zip_Set_Figure_Text( Data, name_figure, msg); zipview_Draw_Figure( View, name_figure, AttributesPane ); } OUT(Show_Point); *** overhead/pobbconf/pobbconf.c Wed Jan 17 16:41:00 1990 --- overhead/pobbconf/pobbconf.c.NEW Mon Jan 29 13:11:26 1990 *************** *** 472,477 **** --- 472,478 ---- "~bb/?[MailboxName]", "~as55/?[MailboxName]", "~us0s/?[MailboxName]", + "~ma55/?[MailboxName]", #if (pobb_WPInteractive) "?[WPIInBox]", #endif /* (pobb_WPInteractive) */ *************** *** 488,494 **** "~cdec/?[MailboxName]", "~dc0m/?[MailboxName]", "~itcbb/?[MailboxName]", - "~cswadv/?[MailboxName]", "~deptbb/?[MailboxName]", "~deptbb/restrictbb/?[MailboxName]", "~deptbb/csdbb/?[MailboxName]", --- 489,494 ---- *************** *** 497,503 **** "~deptbb/hssbb/?[MailboxName]", "~deptbb/unique-bb/?[MailboxName]", "~deptbb/libbb/?[MailboxName]", - /* "~ma55/?[MailboxName]", */ "?[PostmasterMailbox]", "~hm99/?[MailboxName]", "~pcs/?[MailboxName]", --- 497,502 ---- *************** *** 554,559 **** --- 553,559 ---- "?[LOCALSEARCHPATHTEMPLATE]/org/advisor/outbox", "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services", "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/ASDiv", + "?[LOCALSEARCHPATHTEMPLATE]/org/macadvisor", "?[NetBBHome]/info/[a-z]*", "?[NetBBHome]/in.comp", "/afs/andrew.cmu.edu/usr0/deptbb/.MSGS/ece", *************** *** 640,648 **** "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/CSMgrs first before one day after five months ago", "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/PCSGbb first before one day after five months ago", "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/lib-ts first before one day after five months ago", - "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/vaxannounce first before one day after five months ago", - "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/vaxlib first before one day after five months ago", - "?[LOCALSEARCHPATHTEMPLATE]/org/acad-services/vmsnotes first before one day after five months ago", NULL }; char **PurgingCommandsMonthly = initPurgingCommandsMonthly; --- 640,645 ---- *** overhead/pobbconf/config.awk.pobb Wed Jan 17 16:41:14 1990 --- overhead/pobbconf/config.awk.pobb.NEW Mon Jan 29 13:11:31 1990 *************** *** 400,406 **** %ifdef pobb_WPUpdate ++tIx; potask[tIx] = ""; # used to run on the first PO machine: loosen that now. ! cron[tIx] = "31 18 * * * root ?[wpbuildDir]/buildwp.cron"; cost[tIx] = wpCost; name[tIx] = "wpbuild"; n[tIx] = "White Pages rebuild"; --- 400,406 ---- %ifdef pobb_WPUpdate ++tIx; potask[tIx] = ""; # used to run on the first PO machine: loosen that now. ! cron[tIx] = "31 18 * * * root ?[wpbuildDir]/buildwp.cron.stalled"; cost[tIx] = wpCost; name[tIx] = "wpbuild"; n[tIx] = "White Pages rebuild"; END OF ANDREW PATCH 3