*** Makefile% Fri Feb 9 00:31:23 1996 --- Makefile Fri Jan 21 02:59:33 2000 *************** *** 1,12 **** # FILE: Makefile ! # PACKAGE: bosss - # DESCRIPTION: # Makefile for CASIO B.O.S.S. utilities. # # REVISION HISTORY: CC=gcc ! CFLAGS=-O #CFLAGS= YACC=bison YACCFLAGS=-y -d --- 1,16 ---- # FILE: Makefile ! # PACKAGE: boss - # DESCRIPTION: # Makefile for CASIO B.O.S.S. utilities. # # REVISION HISTORY: CC=gcc ! # Known pre-processor params: ! # HAVE_STRERROR - set if your system supports strerror(); ! # BOGOMIPS - set to your the BogoMips value that kernel reports ! # for your system on boot up (this is used for timing); ! CFLAGS=-O -g -DHAVE_STRERROR -DBOGOMIPS=53 #CFLAGS= YACC=bison YACCFLAGS=-y -d *** bossP.h% Tue Jan 30 21:31:35 1996 --- bossP.h Sat Jan 15 14:53:38 2000 *************** *** 59,65 **** #define KEYWORDCMP(a,b) strcasecmp((a),(b)) #define DEFTABSIZE 8 #define CB(s,n) { if(Boss.cb) (Boss.cb)((s),(n)); } ! /* * Macros for converting from 24-hour time to 12-hour time. */ --- 59,65 ---- #define KEYWORDCMP(a,b) strcasecmp((a),(b)) #define DEFTABSIZE 8 #define CB(s,n) { if(Boss.cb) (Boss.cb)((s),(n)); } ! #define YYSTYPE union ystack /* * Macros for converting from 24-hour time to 12-hour time. */ *** boss_io.c% Wed Jan 31 20:03:59 1996 --- boss_io.c Fri Jan 21 03:03:07 2000 *************** *** 74,80 **** --- 74,94 ---- * * Better solutions to this hack would be appreciated! */ + #ifdef BOGOMIPS + #if BOGOMIPS < 50 + #define MAX_COUNT 50 + #elif BOGOMIPS > 50 && BOGOMIPS < 70 + #define MAX_COUNT 200 + #elif BOGOMIPS > 70 && BOGOMIPS < 90 + #define MAX_COUNT 1000 + #elif BOGOMIPS > 90 && BOGOMIPS < 110 + #define MAX_COUNT 5000 + #else + #define MAX_COUNT 20000 + #endif + #else #define MAX_COUNT (200*100) + #endif /* BOGOMIPS */ /* * Write a single character to the serial port. *************** *** 1732,1738 **** while(1) { n = get_record(fd, &rec); if( n < 0 ) { ! return NULL; } if( rec.calculated != rec.checksum ) --- 1746,1752 ---- while(1) { n = get_record(fd, &rec); if( n < 0 ) { ! return -1; } if( rec.calculated != rec.checksum ) *************** *** 2151,2271 **** static int put_phone(int fd, BOSS_PHONE *rec) { int n, c; ! int total; ! ! total = 9; ! do { ! if( rec->free6 == NULL ) ! total -= 1; ! else ! break; ! if( rec->free5 == NULL ) ! total -= 1; ! else ! break; ! if( rec->free4 == NULL ) ! total -= 1; ! else ! break; ! if( rec->free3 == NULL ) ! total -= 1; ! else ! break; ! if( rec->free2 == NULL ) ! total -= 1; ! else ! break; ! if( rec->free1 == NULL ) ! total -= 1; ! else ! break; ! if( rec->address == NULL ) ! total -= 1; ! else ! break; ! if( rec->number == NULL ) ! total -= 1; ! else ! break; ! if( rec->name == NULL ) ! total -= 1; ! else ! break; ! } while(0); ! set_offset(0); ! if( total >= 1 ) { ! c = (total == 1) ? 0 : '\012'; ! n = put_strings(fd, c, rec->name); ! if( n < 0 ) ! return -1; ! } ! if( total >= 2 ) { ! c = (total == 2) ? 0 : '\012'; ! n = put_strings(fd, c, rec->number); ! if( n < 0 ) ! return -1; ! } ! if( total >= 3 ) { ! c = (total == 3) ? 0 : '\012'; ! n = put_strings(fd, c, rec->address); ! if( n < 0 ) ! return -1; ! } ! if( total >= 4 ) { ! c = (total == 4) ? 0 : '\012'; ! n = put_strings(fd, c, rec->free1); ! if( n < 0 ) ! return -1; ! } ! if( total >= 5 ) { ! c = (total == 5) ? 0 : '\012'; ! n = put_strings(fd, c, rec->free2); ! if( n < 0 ) ! return -1; ! } ! if( total >= 6 ) { ! c = (total == 6) ? 0 : '\012'; ! n = put_strings(fd, c, rec->free3); ! if( n < 0 ) ! return -1; ! } ! if( total >= 7 ) { ! c = (total == 7) ? 0 : '\012'; ! n = put_strings(fd, c, rec->free4); ! if( n < 0 ) ! return -1; ! } ! if( total >= 8 ) { ! c = (total == 8) ? 0 : '\012'; ! n = put_strings(fd, c, rec->free5); ! if( n < 0 ) ! return -1; ! } ! if( total >= 9 ) { ! c = (total == 9) ? 0 : '\012'; ! n = put_strings(fd, c, rec->free6); ! if( n < 0 ) ! return -1; ! } n = put_endofrec(fd); return n; --- 2165,2257 ---- static int put_phone(int fd, BOSS_PHONE *rec) { int n, c; ! char *str; ! set_offset(0); ! /* The logic has been changed from original code to better ! ** fit record format. ! */ ! if( rec->name ) ! str = rec->name; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->number ) ! str = rec->number; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->address ) ! str = rec->address; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->free1 ) ! str = rec->free1; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->free2 ) ! str = rec->free2; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->free3 ) ! str = rec->free3; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->free4 ) ! str = rec->free4; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->free5 ) ! str = rec->free5; ! else ! str = ""; ! n = put_strings(fd, '\012', str); ! if( n < 0 ) ! return -1; ! if( rec->free6 ) ! str = rec->free6; ! else ! str = ""; ! n = put_strings(fd, '\000', str); ! if( n < 0 ) ! return -1; n = put_endofrec(fd); return n; *** boss_parse.y% Fri Feb 9 00:52:07 1996 --- boss_parse.y Sat Jan 15 14:30:44 2000 *************** *** 27,32 **** --- 27,33 ---- static BOSS_TIME no_time(void); static BOSS_DATE mkdate(int, int, int, int); static DATETIME mk_datetime(BOSS_DATE *, BOSS_TIME *); + static RANGE mkrange(BOSS_TIME *start, BOSS_TIME *end); static BOSS_PHONE *phone_join(BOSS_PHONE *, BOSS_PHONE *); static BOSS_MEMO *memo_join(BOSS_MEMO *, BOSS_MEMO *); static BOSS_SCHEDULE *schedule_join(BOSS_SCHEDULE *, BOSS_SCHEDULE *); *** bosslib.c% Thu Feb 1 21:51:57 1996 --- bosslib.c Sat Jan 15 15:12:06 2000 *************** *** 23,30 **** --- 23,34 ---- char *boss_strerror(int i) { + #ifdef HAVE_STRERROR + return strerror(i); + #else extern char *sys_errlist[]; return sys_errlist[ i ]; + #endif /* HAVE_STRERROR */ } static void free_phone(BOSS_PHONE *p) *** fmt.c% Wed Jan 31 19:41:33 1996 --- fmt.c Sat Jan 15 15:11:23 2000 *************** *** 21,31 **** --- 21,33 ---- extern char *tmpnam(char *); + #ifndef HAVE_STRERROR static char *strerror(int i) { extern char *sys_errlist[]; return sys_errlist[ i ]; } + #endif /* HAVE_STRERROR */ static void usage(void) { *** main.c% Tue Jan 30 21:45:21 1996 --- main.c Thu Jan 20 03:35:17 2000 *************** *** 24,35 **** { BossStop(); } ! static char *strerror(int i) { extern char *sys_errlist[]; return sys_errlist[ i ]; } static void verbose_cb(char *msg, int cnt) { --- 24,37 ---- { BossStop(); } ! ! #ifndef HAVE_STRERROR static char *strerror(int i) { extern char *sys_errlist[]; return sys_errlist[ i ]; } + #endif /* HAVE_STRERROR */ static void verbose_cb(char *msg, int cnt) { *************** *** 408,424 **** fputc(c, fp); fclose(fp); n = unlink(tmpfile); if( n < 0 ) { fprintf(stderr, "%s: %s\n", tmpfile, strerror(errno)); exit(1); } - bp = BossParse(tmpfile); - if( bp == NULL ) { - fprintf(stderr, "%s\n", BossError()); - exit(1); - } } if( !quiet_mode ) --- 410,427 ---- fputc(c, fp); fclose(fp); + bp = BossParse(tmpfile); + if( bp == NULL ) { + fprintf(stderr, "%s\n", BossError()); + exit(1); + } + n = unlink(tmpfile); if( n < 0 ) { fprintf(stderr, "%s: %s\n", tmpfile, strerror(errno)); exit(1); } } if( !quiet_mode ) *** merge.c% Fri Feb 2 17:59:19 1996 --- merge.c Fri Jan 21 03:04:24 2000 *************** *** 21,31 **** --- 21,33 ---- extern char *tmpnam(char *); + #ifndef HAVE_STRERROR static char *strerror(int i) { extern char *sys_errlist[]; return sys_errlist[ i ]; } + #endif /* HAVE_STRERROR */ static void help(void) {