home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 October / usenetsourcesnewsgroupsinfomagicoctober1994disk2.iso / x / volume14 / boss / patch3 / patch
Text File  |  1991-08-26  |  32KB  |  1,091 lines
  1. *** Makefile.orig    Wed Jul 24 09:38:23 1991
  2. --- Makefile    Fri May 17 09:10:01 1991
  3. ***************
  4. *** 22,28 ****
  5.   
  6.   OFILES        = about.o boss.o boss_ui.o busy.o calentool.o casio_master.o casio_slave.o \
  7.             database.o do_clear.o do_load.o do_port.o do_schedule.o do_store.o \
  8. !           expand.o filename_completion.o list_misc.o misc.o object.o packet.o \
  9.             parse.o pinned_menu_notify.o place_dialog.o print.o \
  10.             record.o send_mail.o window_misc.o
  11.   
  12. --- 22,28 ----
  13.   
  14.   OFILES        = about.o boss.o boss_ui.o busy.o calentool.o casio_master.o casio_slave.o \
  15.             database.o do_clear.o do_load.o do_port.o do_schedule.o do_store.o \
  16. !           expand.o filename_completion.o getopt.o list_misc.o misc.o object.o packet.o \
  17.             parse.o pinned_menu_notify.o place_dialog.o print.o \
  18.             record.o send_mail.o window_misc.o
  19.   
  20. *** README.orig    Wed Jul 24 09:38:25 1991
  21. --- README    Wed Jul 24 09:36:03 1991
  22. ***************
  23. *** 17,23 ****
  24.   /*    without prior permission from Harris Corporation.         */
  25.   /************************************************************************/
  26.   
  27. !             Boss Version 1.0
  28.   
  29.        Boss lets Casio BOSS users transfer data between their BOSS and
  30.   a workstation.  Users can also convert BOSS schedule items to formats useful
  31. --- 17,23 ----
  32.   /*    without prior permission from Harris Corporation.         */
  33.   /************************************************************************/
  34.   
  35. !             Boss Version 1.0c
  36.   
  37.        Boss lets Casio BOSS users transfer data between their BOSS and
  38.   a workstation.  Users can also convert BOSS schedule items to formats useful
  39. *** Imakefile.orig    Wed Jul 24 09:38:25 1991
  40. --- Imakefile    Fri May 17 09:10:01 1991
  41. ***************
  42. *** 12,24 ****
  43.   
  44.   SRCS        = about.c boss.c boss_ui.c busy.c calentool.c casio_master.c casio_slave.c \
  45.             database.c do_clear.c do_load.c do_port.c do_schedule.c do_store.c \
  46. !           expand.c filename_completion.c list_misc.c misc.c object.c packet.c \
  47.             parse.y pinned_menu_notify.c place_dialog.c print.c \
  48.             record.c send_mail.c window_misc.c
  49.   
  50.   OBJS        = about.o boss.o boss_ui.o busy.o calentool.o casio_master.o casio_slave.o \
  51.             database.o do_clear.o do_load.o do_port.o do_schedule.o do_store.o \
  52. !           expand.o filename_completion.o list_misc.o misc.o object.o packet.o \
  53.             parse.o pinned_menu_notify.o place_dialog.o print.o \
  54.             record.o send_mail.o window_misc.o
  55.   
  56. --- 12,24 ----
  57.   
  58.   SRCS        = about.c boss.c boss_ui.c busy.c calentool.c casio_master.c casio_slave.c \
  59.             database.c do_clear.c do_load.c do_port.c do_schedule.c do_store.c \
  60. !           expand.c filename_completion.c getopt.c list_misc.c misc.c object.c packet.c \
  61.             parse.y pinned_menu_notify.c place_dialog.c print.c \
  62.             record.c send_mail.c window_misc.c
  63.   
  64.   OBJS        = about.o boss.o boss_ui.o busy.o calentool.o casio_master.o casio_slave.o \
  65.             database.o do_clear.o do_load.o do_port.o do_schedule.o do_store.o \
  66. !           expand.o filename_completion.o getopt.o list_misc.o misc.o object.o packet.o \
  67.             parse.o pinned_menu_notify.o place_dialog.o print.o \
  68.             record.o send_mail.o window_misc.o
  69.   
  70. *** boss.man.orig    Wed Jul 24 09:38:26 1991
  71. --- boss.man    Wed Mar 27 07:27:30 1991
  72. ***************
  73. *** 75,82 ****
  74.   The text fields associated with \*(lqCasio-format file\*(rq and \*(lqASCII text file\*(rq
  75.   provide file name completion, like \f2csh\fP(1), by typing
  76.   a space or carriage return.
  77. ! .IP "\fBFile: Save Data...\fP"
  78. ! brings up the \fBSave Data\fP dialog box.  This dialog contains a non-exclusive
  79.   setting labeled \*(lqStore items\*(rq that lets you choose which items are to
  80.   be stored.  Only those items selected in this setting will be written to the
  81.   destination selected.
  82. --- 75,82 ----
  83.   The text fields associated with \*(lqCasio-format file\*(rq and \*(lqASCII text file\*(rq
  84.   provide file name completion, like \f2csh\fP(1), by typing
  85.   a space or carriage return.
  86. ! .IP "\fBFile: Store Data...\fP"
  87. ! brings up the \fBStore Data\fP dialog box.  This dialog contains a non-exclusive
  88.   setting labeled \*(lqStore items\*(rq that lets you choose which items are to
  89.   be stored.  Only those items selected in this setting will be written to the
  90.   destination selected.
  91. *** boss_ui.c.orig    Wed Jul 24 09:38:29 1991
  92. --- boss_ui.c    Wed Jul 24 09:38:17 1991
  93. ***************
  94. *** 103,109 ****
  95.           XV_KEY_DATA, INSTANCE, ip,
  96.           MENU_ITEM,
  97.               XV_KEY_DATA, INSTANCE, ip,
  98. !             MENU_STRING, "Port properties...",
  99.               MENU_GEN_PROC, port_dialog,
  100.               NULL,
  101.           MENU_DEFAULT, 2,
  102. --- 103,109 ----
  103.           XV_KEY_DATA, INSTANCE, ip,
  104.           MENU_ITEM,
  105.               XV_KEY_DATA, INSTANCE, ip,
  106. !             MENU_STRING, "Port Properties...",
  107.               MENU_GEN_PROC, port_dialog,
  108.               NULL,
  109.           MENU_DEFAULT, 2,
  110. ***************
  111. *** 192,198 ****
  112.           XV_KEY_DATA, INSTANCE, ip,
  113.           XV_WIDTH, 256,
  114.           XV_HEIGHT, 88,
  115. !         XV_LABEL, "Boss 1.0b",
  116.           FRAME_CLOSED, FALSE,
  117.           FRAME_SHOW_FOOTER, FALSE,
  118.           FRAME_SHOW_RESIZE_CORNER, FALSE,
  119. --- 192,198 ----
  120.           XV_KEY_DATA, INSTANCE, ip,
  121.           XV_WIDTH, 256,
  122.           XV_HEIGHT, 88,
  123. !         XV_LABEL, "Boss 1.0c",
  124.           FRAME_CLOSED, FALSE,
  125.           FRAME_SHOW_FOOTER, FALSE,
  126.           FRAME_SHOW_RESIZE_CORNER, FALSE,
  127. ***************
  128. *** 1658,1666 ****
  129.           XV_HELP_DATA, "boss:msg_1",
  130.           XV_X, 222,
  131.           XV_Y, 14,
  132. !         XV_WIDTH, 66,
  133.           XV_HEIGHT, 13,
  134. !         PANEL_LABEL_STRING, "Boss 1.0b",
  135.           PANEL_LABEL_BOLD, TRUE,
  136.           NULL);
  137.       return obj;
  138. --- 1658,1666 ----
  139.           XV_HELP_DATA, "boss:msg_1",
  140.           XV_X, 222,
  141.           XV_Y, 14,
  142. !         XV_WIDTH, 64,
  143.           XV_HEIGHT, 13,
  144. !         PANEL_LABEL_STRING, "Boss 1.0c",
  145.           PANEL_LABEL_BOLD, TRUE,
  146.           NULL);
  147.       return obj;
  148. ***************
  149. *** 2063,2073 ****
  150.       obj = xv_create(owner, PANEL_BUTTON,
  151.           XV_KEY_DATA, INSTANCE, ip,
  152.           XV_HELP_DATA, "boss:send_mail",
  153. !         XV_X, 215,
  154.           XV_Y, 352,
  155. !         XV_WIDTH, 78,
  156.           XV_HEIGHT, 20,
  157. !         PANEL_LABEL_STRING, "Send Mail",
  158.           PANEL_NOTIFY_PROC, popup_send_mail,
  159.           NULL);
  160.       return obj;
  161. --- 2063,2073 ----
  162.       obj = xv_create(owner, PANEL_BUTTON,
  163.           XV_KEY_DATA, INSTANCE, ip,
  164.           XV_HELP_DATA, "boss:send_mail",
  165. !         XV_X, 210,
  166.           XV_Y, 352,
  167. !         XV_WIDTH, 87,
  168.           XV_HEIGHT, 20,
  169. !         PANEL_LABEL_STRING, "Send Mail...",
  170.           PANEL_NOTIFY_PROC, popup_send_mail,
  171.           NULL);
  172.       return obj;
  173. *** casio.h.orig    Wed Jul 24 09:38:34 1991
  174. --- casio.h    Wed Jul 17 08:26:00 1991
  175. ***************
  176. *** 24,33 ****
  177.   /************************************************************************/
  178.   
  179.   #define        PACKET_START        ':'
  180. ! #define        XMIT_TERMINATE        '!'
  181. ! #define        RCV_ERROR        '"'
  182. ! #define        PACKET_ACK        '#'
  183. ! #define        MODE_ERROR        '$'
  184.   
  185.   PUBLIC    int    open_casio();
  186.   PUBLIC    int    read_casio();
  187. --- 24,34 ----
  188.   /************************************************************************/
  189.   
  190.   #define        PACKET_START        ':'
  191. ! #define        XMIT_TERMINATE        0x21
  192. ! #define        RCV_ERROR        0x22
  193. ! #define        PACKET_ACK        0x23
  194. ! #define        MODE_ERROR        0x24
  195. ! #define        XMIT_ERROR        0x3f
  196.   
  197.   PUBLIC    int    open_casio();
  198.   PUBLIC    int    read_casio();
  199. *** casio_master.c.orig    Wed Jul 24 09:38:35 1991
  200. --- casio_master.c    Wed Jun 19 10:18:45 1991
  201. ***************
  202. *** 220,227 ****
  203.   byte    b;
  204.   
  205.   {
  206. !     buf[0] = FLUSH_CASIO;
  207.       buf[1] = b;
  208.       if (do_write(buf, 2))
  209.          read_reply();
  210.   }
  211. --- 220,239 ----
  212.   byte    b;
  213.   
  214.   {
  215. !     buf[0] = UNGET_BYTE;
  216.       buf[1] = b;
  217.       if (do_write(buf, 2))
  218. +        read_reply();
  219. + }
  220. + 
  221. + /************************************************************************/
  222. + EXPORT    wait_casio(delay)
  223. + 
  224. + int    delay;
  225. + 
  226. + {
  227. +     buf[0] = WAIT_CASIO;
  228. +     bcopy(&delay, buf + 1, sizeof(int));
  229. +     if (do_write(buf, 5))
  230.          read_reply();
  231.   }
  232. *** casio_slave.c.orig    Wed Jul 24 09:38:36 1991
  233. --- casio_slave.c    Wed Jun 19 10:18:44 1991
  234. ***************
  235. *** 292,297 ****
  236. --- 292,304 ----
  237.             case UNGET_BYTE           : if ((b = getc(commands_in)) != EOF)
  238.                                  unget_byte(b);
  239.                               break;
  240. +           case WAIT_CASIO           : if (fread(&timeout, 1, sizeof(int), commands_in) == sizeof(int)) {
  241. +                                usleep(timeout * 1000);
  242. +                                return_result(NULL);
  243. +                                }
  244. +                             else
  245. +                                return_result("Error reading WAIT_CASIO parameters in Casio slave");
  246. +                             break;
  247.             default                   : return_result("Unknown protocol command: %d", cmd);
  248.                               break;
  249.             }
  250. *** do_load.c.orig    Wed Jul 24 09:38:38 1991
  251. --- do_load.c    Wed Jul 17 15:42:24 1991
  252. ***************
  253. *** 55,66 ****
  254.             xv_set(dialog->casio_source,
  255.                       PANEL_VALUE, casio_file,
  256.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  257. !                     PANEL_NOTIFY_STRING, "\n\r ",
  258.                       PANEL_INACTIVE, TRUE,
  259.                    NULL);
  260.             xv_set(dialog->ascii_source,
  261.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  262. !                     PANEL_NOTIFY_STRING, "\n\r ",
  263.                       PANEL_INACTIVE, TRUE,
  264.                    NULL);
  265.             xv_set(dialog->source, PANEL_VALUE, 0, NULL);
  266. --- 55,66 ----
  267.             xv_set(dialog->casio_source,
  268.                       PANEL_VALUE, casio_file,
  269.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  270. !                     PANEL_NOTIFY_STRING, "\n\r\t ",
  271.                       PANEL_INACTIVE, TRUE,
  272.                    NULL);
  273.             xv_set(dialog->ascii_source,
  274.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  275. !                     PANEL_NOTIFY_STRING, "\n\r\t ",
  276.                       PANEL_INACTIVE, TRUE,
  277.                    NULL);
  278.             xv_set(dialog->source, PANEL_VALUE, 0, NULL);
  279. *** do_schedule.c.orig    Wed Jul 24 09:38:40 1991
  280. --- do_schedule.c    Wed Jul 17 15:42:23 1991
  281. ***************
  282. *** 188,194 ****
  283.             xv_set(dialog->appt_file,
  284.                       PANEL_VALUE, appts_file,
  285.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  286. !                     PANEL_NOTIFY_STRING, "\n\r ",
  287.                       PANEL_INACTIVE, FALSE,
  288.                    NULL);
  289.             xv_set(dialog->schedule_format, PANEL_VALUE, 0, NULL);
  290. --- 188,194 ----
  291.             xv_set(dialog->appt_file,
  292.                       PANEL_VALUE, appts_file,
  293.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  294. !                     PANEL_NOTIFY_STRING, "\n\r\t ",
  295.                       PANEL_INACTIVE, FALSE,
  296.                    NULL);
  297.             xv_set(dialog->schedule_format, PANEL_VALUE, 0, NULL);
  298. *** do_store.c.orig    Wed Jul 24 09:38:41 1991
  299. --- do_store.c    Wed Jul 17 15:42:23 1991
  300. ***************
  301. *** 57,68 ****
  302.             xv_set(dialog->casio_dest,
  303.                       PANEL_VALUE, casio_file,
  304.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  305. !                     PANEL_NOTIFY_STRING, "\n\r ",
  306.                       PANEL_INACTIVE, TRUE,
  307.                    NULL);
  308.             xv_set(dialog->ascii_dest,
  309.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  310. !                     PANEL_NOTIFY_STRING, "\n\r ",
  311.                       PANEL_INACTIVE, TRUE,
  312.                    NULL);
  313.             xv_set(dialog->store_data, PANEL_VALUE, (1 << MAX_OBJECT_KINDS) - 1, NULL);
  314. --- 57,68 ----
  315.             xv_set(dialog->casio_dest,
  316.                       PANEL_VALUE, casio_file,
  317.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  318. !                     PANEL_NOTIFY_STRING, "\n\r\t ",
  319.                       PANEL_INACTIVE, TRUE,
  320.                    NULL);
  321.             xv_set(dialog->ascii_dest,
  322.                       PANEL_NOTIFY_LEVEL, PANEL_SPECIFIED,
  323. !                     PANEL_NOTIFY_STRING, "\n\r\t ",
  324.                       PANEL_INACTIVE, TRUE,
  325.                    NULL);
  326.             xv_set(dialog->store_data, PANEL_VALUE, (1 << MAX_OBJECT_KINDS) - 1, NULL);
  327. *** filename_completion.c.orig    Wed Jul 24 09:38:42 1991
  328. --- filename_completion.c    Wed Jul 17 15:42:21 1991
  329. ***************
  330. *** 41,47 ****
  331.   
  332.       switch (event_action(event)) {
  333.          case '\n' :
  334. !        case '\r' :
  335.          case ' '  : if ((p = expand_filename((char *) xv_get(item, PANEL_VALUE))) == NULL)
  336.                    window_bell(xv_get(item, XV_OWNER));
  337.                     else
  338. --- 41,47 ----
  339.   
  340.       switch (event_action(event)) {
  341.          case '\n' :
  342. !        case '\r' : 
  343.          case ' '  : if ((p = expand_filename((char *) xv_get(item, PANEL_VALUE))) == NULL)
  344.                    window_bell(xv_get(item, XV_OWNER));
  345.                     else
  346. *** getopt.c.orig    Wed Jul 24 09:38:43 1991
  347. --- getopt.c    Fri May 17 09:10:22 1991
  348. ***************
  349. *** 0 ****
  350. --- 1,64 ----
  351. + /************************************************************************/
  352. + /*    Copyright 1987-1991 by Chuck Musciano and Harris Corporation     */
  353. + /*                                    */
  354. + /*    Full ownership of this software, and all rights pertaining to     */
  355. + /*    the for-profit distribution of this software, are retained by     */
  356. + /*    Chuck Musciano and Harris Corporation.  You are permitted to     */
  357. + /*    use this software without fee.  This software is provided "as     */
  358. + /*    is" without express or implied warranty.  You may redistribute     */
  359. + /*    this software, provided that this copyright notice is retained,    */
  360. + /*    and that the software is not distributed for profit.  If you     */
  361. + /*    wish to use this software in a profit-making venture, you must     */
  362. + /*    first license this code and its underlying technology from     */
  363. + /*    Harris Corporation.                         */
  364. + /*                                    */
  365. + /*    Bottom line: you can have this software, you can use it, you     */
  366. + /*    can give it away.  You just can't sell any or all parts of it     */
  367. + /*    without prior permission from Harris Corporation.         */
  368. + /************************************************************************/
  369. + 
  370. + #include    <stdio.h>
  371. + 
  372. + #include    "manifest.h"
  373. + 
  374. + /************************************************************************/
  375. + PRIVATE    delarg(argc, argv)
  376. + 
  377. + int    *argc;
  378. + char    **argv;
  379. + 
  380. + {    char    *p;
  381. + 
  382. +     while (*argv = *(argv+1))
  383. +        argv++;
  384. +     (*argc)--;
  385. + }
  386. + 
  387. + /************************************************************************/
  388. + EXPORT    char    getopt(argc, argv, opts, parm)
  389. + 
  390. + int    *argc;
  391. + char    **argv;
  392. + char    *opts;
  393. + char    **parm;
  394. + 
  395. + {    char    c, *p, *strcpy(), *index();
  396. +     int    killed;
  397. + 
  398. +     *parm = NULL;
  399. +     while (*argv && ((**argv != '-') || (*(*argv+1) == '\0')))
  400. +        argv++;
  401. +     if (*argv == NULL)
  402. +        return(EOF);
  403. +     c = *(*argv+1);
  404. +     *++(*argv) = '-';
  405. +     if (killed = (*(*argv+1) == '\0'))
  406. +        delarg(argc, argv);
  407. +     if ((p = index(opts, c)) == NULL)
  408. +        c = '\0';
  409. +     else if (*(p+1) == ':') {
  410. +        *parm = killed ? *argv : *argv+1;
  411. +        delarg(argc, argv);
  412. +        }
  413. +     return(c);
  414. + }
  415. *** misc.c.orig    Wed Jul 24 09:38:46 1991
  416. --- misc.c    Fri May 17 09:10:00 1991
  417. ***************
  418. *** 117,164 ****
  419.   }
  420.   
  421.   /************************************************************************/
  422. - PRIVATE    delarg(argc, argv)
  423. - 
  424. - int    *argc;
  425. - char    **argv;
  426. - 
  427. - {    char    *p;
  428. - 
  429. -     while (*argv = *(argv+1))
  430. -        argv++;
  431. -     (*argc)--;
  432. - }
  433. - 
  434. - /************************************************************************/
  435. - EXPORT    char    getopt(argc, argv, opts, parm)
  436. - 
  437. - int    *argc;
  438. - char    **argv;
  439. - char    *opts;
  440. - char    **parm;
  441. - 
  442. - {    char    c, *p, *index();
  443. -     int    killed;
  444. - 
  445. -     *parm = NULL;
  446. -     while (*argv && ((**argv != '-') || (*(*argv+1) == '\0')))
  447. -        argv++;
  448. -     if (*argv == NULL)
  449. -        return(EOF);
  450. -     c = *(*argv+1);
  451. -     *++(*argv) = '-';
  452. -     if (killed = (*(*argv+1) == '\0'))
  453. -        delarg(argc, argv);
  454. -     if ((p = index(opts, c)) == NULL)
  455. -        c = '\0';
  456. -     else if (*(p+1) == ':') {
  457. -        *parm = killed ? *argv : *argv+1;
  458. -        delarg(argc, argv);
  459. -        }
  460. -     return(c);
  461. - }
  462. - 
  463. - /************************************************************************/
  464.   EXPORT    int    is_empty(s)
  465.   
  466.   char    *s;
  467. --- 117,122 ----
  468. *** object.c.orig    Wed Jul 24 09:38:46 1991
  469. --- object.c    Wed Jul 17 15:18:34 1991
  470. ***************
  471. *** 24,29 ****
  472. --- 24,30 ----
  473.   /************************************************************************/
  474.   
  475.   #include    "manifest.h"
  476. + #include    "packet.h"
  477.   #include    "record.h"
  478.   #include    "object.h"
  479.   
  480. ***************
  481. *** 44,52 ****
  482.   
  483.   object    *obj;
  484.   
  485. ! {
  486. !     if (obj->buf)
  487. !        free(obj->buf);
  488.       free(obj);
  489.   }
  490.   
  491. --- 45,55 ----
  492.   
  493.   object    *obj;
  494.   
  495. ! {    int    i;
  496. ! 
  497. !     for (i = 0; i < MAX_FIELDS + 1; i++)
  498. !        if (obj->field[i])
  499. !           free(obj->field[i]);
  500.       free(obj);
  501.   }
  502.   
  503. ***************
  504. *** 73,84 ****
  505.   
  506.       obj = create_object();
  507.       obj->kind = OBJ_MEMO;
  508. !     obj->buf = (byte *) malloc(sizeof(byte) * MAX_OBJECT_DATA);
  509. !     strcpy(obj->buf, buf);
  510. !     for (buf = obj->buf; *buf; buf++)
  511.          if (*buf == '\n')
  512.             *buf = '\r';
  513. -     obj->mem_memo = obj->buf;
  514.       return(obj);
  515.   }
  516.   
  517. --- 76,87 ----
  518.   
  519.       obj = create_object();
  520.       obj->kind = OBJ_MEMO;
  521. !     obj->mem_memo = (byte *) strsave(buf);
  522. !     if (strlen(buf) >= MAX_OBJECT_DATA)
  523. !        obj->mem_memo[MAX_OBJECT_DATA] = '\0';
  524. !     for (buf = obj->mem_memo; *buf; buf++)
  525.          if (*buf == '\n')
  526.             *buf = '\r';
  527.       return(obj);
  528.   }
  529.   
  530. ***************
  531. *** 88,94 ****
  532.   record    *rec;
  533.   
  534.   {    object    *obj;
  535. !     byte    *p;
  536.       int    i;
  537.   
  538.       if (rec->type != REC_MODE)
  539. --- 91,97 ----
  540.   record    *rec;
  541.   
  542.   {    object    *obj;
  543. !     byte    *p, buf[MAX_OBJECT_DATA];
  544.       int    i;
  545.   
  546.       if (rec->type != REC_MODE)
  547. ***************
  548. *** 95,109 ****
  549.          return(NULL);
  550.       obj = create_object();
  551.       obj->from_casio = TRUE;
  552.       for ( ; rec; rec = rec->next)
  553.          switch(rec->type) {
  554. !           case REC_DATA     : if (address_kind(rec->address) == REC_DATA_DATA) {
  555. !                            if (obj->buf == NULL) {
  556. !                               obj->buf = (byte *) malloc(sizeof(byte) * MAX_OBJECT_DATA);
  557. !                               bzero(obj->buf, sizeof(byte) * MAX_OBJECT_DATA);
  558. !                               }
  559. !                            bcopy(rec->data, obj->buf + address_start(rec->address), rec->length);
  560. !                            }
  561.                           else if (address_kind(rec->address) == REC_DATA_ALARM) {
  562.                              if (obj->kind == OBJ_SCHEDULE)
  563.                                 ascii_to_time(rec->data, &obj->sch_alarm_time, NULL);
  564. --- 98,108 ----
  565.          return(NULL);
  566.       obj = create_object();
  567.       obj->from_casio = TRUE;
  568. +     bzero(buf, sizeof(buf));
  569.       for ( ; rec; rec = rec->next)
  570.          switch(rec->type) {
  571. !           case REC_DATA     : if (address_kind(rec->address) == REC_DATA_DATA)
  572. !                            bcopy(rec->data, buf + address_start(rec->address), rec->length);
  573.                           else if (address_kind(rec->address) == REC_DATA_ALARM) {
  574.                              if (obj->kind == OBJ_SCHEDULE)
  575.                                 ascii_to_time(rec->data, &obj->sch_alarm_time, NULL);
  576. ***************
  577. *** 177,188 ****
  578.                           free_object(obj);
  579.                           return(NULL);
  580.             }
  581. !     if (obj->buf) {
  582. !        obj->field[0] = obj->buf;
  583. !        for (p = obj->buf, i = 1; *p; p++)
  584.             if (*p == CASIO_END_ENTRY) {
  585.                *p = '\0';
  586. !              obj->field[i++] = p + 1;
  587.                }
  588.          for ( ; i < MAX_FIELDS; i++)
  589.             obj->field[i] = NULL;
  590. --- 176,188 ----
  591.                           free_object(obj);
  592.                           return(NULL);
  593.             }
  594. !     if (*buf) {
  595. !        obj->field[0] = buf;
  596. !        for (p = buf, i = 0; *p; p++)
  597.             if (*p == CASIO_END_ENTRY) {
  598.                *p = '\0';
  599. !              obj->field[i] = (byte *) strsave(obj->field[i]);
  600. !              obj->field[++i] = p + 1;
  601.                }
  602.          for ( ; i < MAX_FIELDS; i++)
  603.             obj->field[i] = NULL;
  604. ***************
  605. *** 199,205 ****
  606.   object    *obj;
  607.   
  608.   {    record    *head, *rec;
  609. !     int    i;
  610.       byte    *p, *q;
  611.   
  612.       head = rec = make_mode_record(0); /* use a dummy mode value */
  613. --- 199,205 ----
  614.   object    *obj;
  615.   
  616.   {    record    *head, *rec;
  617. !     int    i, last, offset;
  618.       byte    *p, *q;
  619.   
  620.       head = rec = make_mode_record(0); /* use a dummy mode value */
  621. ***************
  622. *** 238,268 ****
  623.          free_record(head);
  624.          return(NULL);
  625.          }
  626. !     for (i = 0; i < MAX_FIELDS; i++)
  627. !        if (p = obj->field[i])
  628. !           do {
  629. !              rec->next = create_record();
  630. !              rec = rec->next;
  631. !              rec->type = REC_DATA;
  632. !              if (q = (byte *) index(p, CASIO_END_LINE))
  633. !                 rec->length = q - p + 1;
  634. !              else
  635. !                 rec->length = strlen(p) + 1;
  636. !              rec->address = REC_DATA_DATA + p - obj->buf;
  637. !              bcopy(p, rec->data, rec->length - 1);
  638. !              if (q) {
  639. !                 rec->data[rec->length - 1] = CASIO_END_LINE;
  640. !                 p = q + 1;
  641. !                 }
  642. !              else if (obj->field[i + 1]) {
  643. !                 rec->data[rec->length - 1] = CASIO_END_ENTRY;
  644. !                 p += rec->length - 1;
  645. !                 }
  646. !              else {
  647. !                 rec->length--;
  648. !                 p += rec->length;
  649. !                 }
  650. !              } while (*p);
  651.       rec->next = create_record();
  652.       rec = rec->next;
  653.       rec->length = 0;
  654. --- 238,269 ----
  655.          free_record(head);
  656.          return(NULL);
  657.          }
  658. !     for (last = MAX_FIELDS; last >= 0 && obj->field[last] == NULL; last--)
  659. !        ;
  660. !     for (i = offset = 0; i <= last; i++) {
  661. !        p = obj->field[i];
  662. !        do {
  663. !           rec->next = create_record();
  664. !           rec = rec->next;
  665. !           rec->type = REC_DATA;
  666. !           rec->address = REC_DATA_DATA + offset;
  667. !           if (p == NULL)
  668. !              rec->length = 0;
  669. !           else if (q = (byte *) index(p, CASIO_END_LINE))
  670. !              rec->length = q - p + 1;
  671. !           else
  672. !              rec->length = strlen(p);
  673. !           if (rec->length > 127)
  674. !              rec->length = 127;
  675. !           if (p) {
  676. !              bcopy(p, rec->data, rec->length);
  677. !              p += rec->length;
  678. !              }
  679. !           if ((p == NULL || *p == '\0') && i < last)
  680. !              rec->data[rec->length++] = CASIO_END_ENTRY;
  681. !           offset += rec->length;
  682. !           } while (p && *p);
  683. !        }
  684.       rec->next = create_record();
  685.       rec = rec->next;
  686.       rec->length = 0;
  687. ***************
  688. *** 277,296 ****
  689.   object    *obj;
  690.   
  691.   {    record    *rec, *r;
  692.   
  693. !     rec = object_to_record(obj);
  694. !     if (!send_record(rec))
  695. !        return(FALSE);
  696. !     while (rec) {
  697. !        r = rec;
  698. !        rec = rec->next;
  699. !        free_record(r);
  700.          }
  701. !     if (!wait_for_acknowledgement()) {
  702. !        error("BOSS did not acknowledge receipt of object");
  703. !        return(FALSE);
  704. !        }
  705. !     return(TRUE);
  706.   }
  707.   
  708.   /************************************************************************/
  709. --- 278,305 ----
  710.   object    *obj;
  711.   
  712.   {    record    *rec, *r;
  713. +     int    result, retries;
  714.   
  715. !     for (retries = 4; retries > 0; retries--) {
  716. !        rec = object_to_record(obj);
  717. !        if (!send_record(rec))
  718. !           return(FALSE);
  719. !        while (rec) {
  720. !           r = rec;
  721. !           rec = rec->next;
  722. !           free_record(r);
  723. !           }
  724. !        if ((result = wait_for_acknowledgement()) == OBJECT_RECEIVED)
  725. !           return(TRUE);
  726. !        else if (result == OBJECT_RESEND)
  727. !           wait_casio(3000); /* let's all catch our breath */
  728. !        else {
  729. !           error("BOSS did not acknowledge receipt of object");
  730. !           return(FALSE);
  731. !           }
  732.          }
  733. !     error("Transmission aborted due to repeated failures reported by BOSS");
  734. !     return(FALSE);
  735.   }
  736.   
  737.   /************************************************************************/
  738. *** object.h.orig    Wed Jul 24 09:38:47 1991
  739. --- object.h    Wed Jul 17 10:02:34 1991
  740. ***************
  741. *** 67,73 ****
  742.   
  743.   struct    o_rec    {int    kind;
  744.            int    from_casio;
  745. -          byte    *buf;
  746.            byte    *field[MAX_FIELDS + 1];
  747.            byte    marked;
  748.            date    sch_date;
  749. --- 67,72 ----
  750. *** packet.c.orig    Wed Jul 24 09:38:48 1991
  751. --- packet.c    Wed Jul 17 08:25:59 1991
  752. ***************
  753. *** 25,30 ****
  754. --- 25,31 ----
  755.   
  756.   #include    "manifest.h"
  757.   #include    "casio.h"
  758. + #include    "packet.h"
  759.   
  760.   PRIVATE    int    session_open = FALSE;
  761.   PRIVATE    char    hex[] = "0123456789ABCDEF";
  762. ***************
  763. *** 130,136 ****
  764.                error("error awaiting packet ACK from BOSS");
  765.                return(FALSE);
  766.                }
  767. !           else if (b == '?') {
  768.                disable_flow_control();
  769.                usleep(20000);
  770.                i = read_casio(&b, 1, 1000);
  771. --- 131,137 ----
  772.                error("error awaiting packet ACK from BOSS");
  773.                return(FALSE);
  774.                }
  775. !           else if (b == RCV_ERROR) {
  776.                disable_flow_control();
  777.                usleep(20000);
  778.                i = read_casio(&b, 1, 1000);
  779. ***************
  780. *** 217,226 ****
  781.   
  782.       if (read_casio(&b, 1, 60000) == 1)
  783.          if (b == PACKET_ACK)
  784. !           return(TRUE);
  785.          else
  786.             error("invalid object acknowledgement: %c (%02x)", b, b);
  787.       else
  788.          error("no acknowledgement received from BOSS");
  789. !     return(FALSE);
  790.   }
  791. --- 218,229 ----
  792.   
  793.       if (read_casio(&b, 1, 60000) == 1)
  794.          if (b == PACKET_ACK)
  795. !           return(OBJECT_RECEIVED);
  796. !        else if (b == XMIT_ERROR)
  797. !           return(OBJECT_RESEND);
  798.          else
  799.             error("invalid object acknowledgement: %c (%02x)", b, b);
  800.       else
  801.          error("no acknowledgement received from BOSS");
  802. !     return(OBJECT_ERROR);
  803.   }
  804. *** packet.h.orig    Wed Jul 24 09:38:49 1991
  805. --- packet.h    Wed Jul 17 08:26:01 1991
  806. ***************
  807. *** 35,40 ****
  808. --- 35,44 ----
  809.   #define        PORT_TTYA        0
  810.   #define        PORT_TTYB        1
  811.   
  812. + #define        OBJECT_RECEIVED        0
  813. + #define        OBJECT_RESEND        1
  814. + #define        OBJECT_ERROR        2
  815. + 
  816.   PUBLIC    int    start_session();
  817.   PUBLIC    int    send_packet();
  818.   PUBLIC    int    receive_packet();
  819. *** parse.y.orig    Wed Jul 24 09:38:49 1991
  820. --- parse.y    Wed Jul 17 14:56:06 1991
  821. ***************
  822. *** 79,85 ****
  823.                            parsed_object_list = $2;
  824.                         else
  825.                            $1->next = $2;
  826. -                       fill_fields($2);
  827.                         $$ = $2;
  828.                       }
  829.           ;
  830. --- 79,84 ----
  831. ***************
  832. *** 109,131 ****
  833.   phone_attr    :    marked
  834.                       { curr_object->marked = TRUE; }
  835.           |    name
  836. !                     { add_field(&(curr_object->pho_name), $1); }
  837.           |    number
  838. !                     { add_field(&(curr_object->pho_number), $1); }
  839.           |    address
  840. !                     { add_field(&(curr_object->pho_address), $1); }
  841.           |    extra_1
  842. !                     { add_field(&(curr_object->pho_extra_1), $1); }
  843.           |    extra_2
  844. !                     { add_field(&(curr_object->pho_extra_2), $1); }
  845.           |    extra_3
  846. !                     { add_field(&(curr_object->pho_extra_3), $1); }
  847.           |    extra_4
  848. !                     { add_field(&(curr_object->pho_extra_4), $1); }
  849.           |    extra_5
  850. !                     { add_field(&(curr_object->pho_extra_5), $1); }
  851.           |    extra_6
  852. !                     { add_field(&(curr_object->pho_extra_6), $1); }
  853.           ;
  854.   
  855.   schedule_object    :    LBRACE SCHEDULE
  856. --- 108,130 ----
  857.   phone_attr    :    marked
  858.                       { curr_object->marked = TRUE; }
  859.           |    name
  860. !                     { curr_object->pho_name = (byte *) $1; }
  861.           |    number
  862. !                     { curr_object->pho_number = (byte *) $1; }
  863.           |    address
  864. !                     { curr_object->pho_address = (byte *) $1; }
  865.           |    extra_1
  866. !                     { curr_object->pho_extra_1 = (byte *) $1; }
  867.           |    extra_2
  868. !                     { curr_object->pho_extra_2 = (byte *) $1; }
  869.           |    extra_3
  870. !                     { curr_object->pho_extra_3 = (byte *) $1; }
  871.           |    extra_4
  872. !                     { curr_object->pho_extra_4 = (byte *) $1; }
  873.           |    extra_5
  874. !                     { curr_object->pho_extra_5 = (byte *) $1; }
  875.           |    extra_6
  876. !                     { curr_object->pho_extra_6 = (byte *) $1; }
  877.           ;
  878.   
  879.   schedule_object    :    LBRACE SCHEDULE
  880. ***************
  881. *** 158,164 ****
  882.           |    alarm_time
  883.                       { curr_object->sch_alarm_time = *$1; }
  884.           |    memo
  885. !                     { add_field(&(curr_object->sch_memo), $1); }
  886.           ;
  887.   
  888.   memo_object    :    LBRACE MEMO
  889. --- 157,163 ----
  890.           |    alarm_time
  891.                       { curr_object->sch_alarm_time = *$1; }
  892.           |    memo
  893. !                     { curr_object->sch_memo = (byte *) $1; }
  894.           ;
  895.   
  896.   memo_object    :    LBRACE MEMO
  897. ***************
  898. *** 179,185 ****
  899.   memo_attr    :    marked
  900.                       { curr_object->marked = TRUE; }
  901.           |    memo
  902. !                     { add_field(&(curr_object->sch_memo), $1); }
  903.           ;
  904.   
  905.   card_object    :    LBRACE CARD
  906. --- 178,184 ----
  907.   memo_attr    :    marked
  908.                       { curr_object->marked = TRUE; }
  909.           |    memo
  910. !                     { curr_object->sch_memo = (byte *) $1; }
  911.           ;
  912.   
  913.   card_object    :    LBRACE CARD
  914. ***************
  915. *** 202,236 ****
  916.   card_attr    :    marked
  917.                       { curr_object->marked = TRUE; }
  918.           |    employer
  919. !                     { add_field(&(curr_object->car_employer), $1); }
  920.           |    name
  921. !                     { add_field(&(curr_object->car_name), $1); }
  922.           |    number
  923. !                     { add_field(&(curr_object->car_number), $1); }
  924.           |    position
  925. !                     { add_field(&(curr_object->car_position), $1); }
  926.           |    department
  927. !                     { add_field(&(curr_object->car_department), $1); }
  928.           |    pobox
  929. !                     { add_field(&(curr_object->car_pobox), $1); }
  930.           |    address
  931. !                     { add_field(&(curr_object->car_address), $1); }
  932.           |    telex
  933. !                     { add_field(&(curr_object->car_telex), $1); }
  934.           |    fax
  935. !                     { add_field(&(curr_object->car_fax), $1); }
  936.           |    extra_1
  937. !                     { add_field(&(curr_object->car_extra_1), $1); }
  938.           |    extra_2
  939. !                     { add_field(&(curr_object->car_extra_2), $1); }
  940.           |    extra_3
  941. !                     { add_field(&(curr_object->car_extra_3), $1); }
  942.           |    extra_4
  943. !                     { add_field(&(curr_object->car_extra_4), $1); }
  944.           |    extra_5
  945. !                     { add_field(&(curr_object->car_extra_5), $1); }
  946.           |    extra_6
  947. !                     { add_field(&(curr_object->car_extra_6), $1); }
  948.           ;
  949.   
  950.   calendar_object    :    LBRACE CALENDAR
  951. --- 201,235 ----
  952.   card_attr    :    marked
  953.                       { curr_object->marked = TRUE; }
  954.           |    employer
  955. !                     { curr_object->car_employer = (byte *) $1; }
  956.           |    name
  957. !                     { curr_object->car_name = (byte *) $1; }
  958.           |    number
  959. !                     { curr_object->car_number = (byte *) $1; }
  960.           |    position
  961. !                     { curr_object->car_position = (byte *) $1; }
  962.           |    department
  963. !                     { curr_object->car_department = (byte *) $1; }
  964.           |    pobox
  965. !                     { curr_object->car_pobox = (byte *) $1; }
  966.           |    address
  967. !                     { curr_object->car_address = (byte *) $1; }
  968.           |    telex
  969. !                     { curr_object->car_telex = (byte *) $1; }
  970.           |    fax
  971. !                     { curr_object->car_fax = (byte *) $1; }
  972.           |    extra_1
  973. !                     { curr_object->car_extra_1 = (byte *) $1; }
  974.           |    extra_2
  975. !                     { curr_object->car_extra_2 = (byte *) $1; }
  976.           |    extra_3
  977. !                     { curr_object->car_extra_3 = (byte *) $1; }
  978.           |    extra_4
  979. !                     { curr_object->car_extra_4 = (byte *) $1; }
  980.           |    extra_5
  981. !                     { curr_object->car_extra_5 = (byte *) $1; }
  982.           |    extra_6
  983. !                     { curr_object->car_extra_6 = (byte *) $1; }
  984.           ;
  985.   
  986.   calendar_object    :    LBRACE CALENDAR
  987. ***************
  988. *** 400,449 ****
  989.       error(buf1);
  990.       yyclearin;
  991.       parse_errors_occured++;
  992. - }
  993. - 
  994. - /************************************************************************/
  995. - PRIVATE    add_field(field, value)
  996. - 
  997. - byte    **field;
  998. - byte    *value;
  999. - 
  1000. - {    byte    *p;
  1001. - 
  1002. -     if (*field)
  1003. -        yyerror("duplicate value for this field");
  1004. -     if (value == NULL || *value == '\0')
  1005. -        return;
  1006. -     if (curr_object->buf == NULL) {
  1007. -        curr_object->buf = (byte *) malloc(MAX_OBJECT_DATA);
  1008. -        bzero(curr_object->buf, MAX_OBJECT_DATA);
  1009. -        }
  1010. -     for (p = curr_object->buf + MAX_OBJECT_DATA - 1; p > curr_object->buf && *p == '\0'; p--)
  1011. -        ;
  1012. -     if (*p)
  1013. -        p += 2;
  1014. -     if (p + strlen(value) >= curr_object->buf + MAX_OBJECT_DATA) {
  1015. -        yyerror("too much data for this object");
  1016. -        *field = NULL;
  1017. -        }
  1018. -     else {
  1019. -        strcpy(p, value);
  1020. -        *field = p;
  1021. -        }
  1022. - }
  1023. - 
  1024. - /************************************************************************/
  1025. - PRIVATE    fill_fields(obj)
  1026. - 
  1027. - object    *obj;
  1028. - 
  1029. - {    int    i;
  1030. - 
  1031. -     for (i = MAX_FIELDS - 1; i >= 0; i--)
  1032. -        if (obj->field[i])
  1033. -           for (i--; i >= 0; i--)
  1034. -              if (obj->field[i] == NULL)
  1035. -                 add_field(&(obj->field[i]), "");
  1036.   }
  1037.   
  1038.   #include "lex.c"
  1039. --- 399,404 ----
  1040. *** patchlevel.h.orig    Wed Jul 24 09:38:50 1991
  1041. --- patchlevel.h    Wed Jul 24 09:34:28 1991
  1042. ***************
  1043. *** 19,33 ****
  1044.   
  1045.   /************************************************************************/
  1046.   /*                                    */
  1047. ! /*    0    15 Oct 90    Initial release                */
  1048. ! /*                comp.sources.x: Volume 10, Issues 3-8    */
  1049.   /*                                    */
  1050. ! /*    1     1 Dec 90    Restructured code for maintainability    */
  1051.   /*                Added "About Boss..."            */
  1052.   /*                Added warning about downloads at 9600    */
  1053.   /*                   baud                    */
  1054.   /*                                    */
  1055. ! /*    2    15 Jan 91    Fixed bug in storing marked records    */
  1056.   /*                Enhanced dialog placement        */
  1057.   /*                                    */
  1058.   /************************************************************************/
  1059. --- 19,40 ----
  1060.   
  1061.   /************************************************************************/
  1062.   /*                                    */
  1063. ! /*    0    15 Oct 90    comp.sources.x: Volume 10, Issues 3-8    */
  1064. ! /*                Initial release                */
  1065.   /*                                    */
  1066. ! /*    1     1 Dec 90    comp.sources.x: Volume 10, Issue 91    */
  1067. ! /*                Restructured code for maintainability    */
  1068.   /*                Added "About Boss..."            */
  1069.   /*                Added warning about downloads at 9600    */
  1070.   /*                   baud                    */
  1071.   /*                                    */
  1072. ! /*    2    15 Jan 91    comp.sources.x: Volume 11, Issue 4    */
  1073. ! /*                Fixed bug in storing marked records    */
  1074.   /*                Enhanced dialog placement        */
  1075. + /*                                    */
  1076. + /*    3    24 Jul 91    comp.sources.x: Volume ??, Issue ??    */
  1077. + /*                Fixed unget_byte bug            */
  1078. + /*                Added transmission delay support    */
  1079. + /*                Fixed bug in object field management    */
  1080.   /*                                    */
  1081.   /************************************************************************/
  1082. *** protocol.h.orig    Wed Jul 24 09:38:53 1991
  1083. --- protocol.h    Wed Jun 19 10:18:46 1991
  1084. ***************
  1085. *** 31,33 ****
  1086. --- 31,34 ----
  1087.   #define        DISABLE_FLOW_CONTROL    5
  1088.   #define        FLUSH_CASIO        6
  1089.   #define        UNGET_BYTE        7
  1090. + #define        WAIT_CASIO        8
  1091.