From 38c01699572f287a0327f998827220dcdcc7f837 Mon Sep 17 00:00:00 2001 From: Jay Lepreau Date: Mon, 16 Feb 1987 05:05:08 -0800 Subject: [PATCH] modern syntax for asgops & inits cause Donn's latest ccom rejects the old. SCCS-vsn: local/sccscmds/sccscmds.2/cmd/bdiff.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/bdiff.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/cmt.c 4.4 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/cmt.c 4.4 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/comb.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/comb.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/get.c 4.8 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/get.c 4.8 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/help.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/help.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/prt.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/prt.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/rmchg.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/rmchg.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/snull.c 4.4 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/snull.c 4.4 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/val.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/val.c 4.3 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/delta.c 4.8 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/delta.c 4.8 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/prs.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/prs.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.2/cmd/admin.c 4.2 SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/admin.c 4.2 --- usr/src/local/sccscmds/sccscmds.2/cmd/admin.c | 12 ++--- usr/src/local/sccscmds/sccscmds.2/cmd/bdiff.c | 14 +++--- usr/src/local/sccscmds/sccscmds.2/cmd/cmt.c | 16 +++--- usr/src/local/sccscmds/sccscmds.2/cmd/comb.c | 6 +-- usr/src/local/sccscmds/sccscmds.2/cmd/delta.c | 14 +++--- usr/src/local/sccscmds/sccscmds.2/cmd/get.c | 20 ++++---- usr/src/local/sccscmds/sccscmds.2/cmd/help.c | 6 +-- usr/src/local/sccscmds/sccscmds.2/cmd/prs.c | 19 ++++--- usr/src/local/sccscmds/sccscmds.2/cmd/prt.c | 10 ++-- usr/src/local/sccscmds/sccscmds.2/cmd/rmchg.c | 8 +-- usr/src/local/sccscmds/sccscmds.2/cmd/snull.c | 14 +++--- usr/src/local/sccscmds/sccscmds.2/cmd/val.c | 50 +++++++++---------- .../local/sccscmds/sccscmds.ok/cmd/admin.c | 12 ++--- .../local/sccscmds/sccscmds.ok/cmd/bdiff.c | 14 +++--- usr/src/local/sccscmds/sccscmds.ok/cmd/cmt.c | 16 +++--- usr/src/local/sccscmds/sccscmds.ok/cmd/comb.c | 6 +-- .../local/sccscmds/sccscmds.ok/cmd/delta.c | 14 +++--- usr/src/local/sccscmds/sccscmds.ok/cmd/get.c | 20 ++++---- usr/src/local/sccscmds/sccscmds.ok/cmd/help.c | 6 +-- usr/src/local/sccscmds/sccscmds.ok/cmd/prs.c | 19 ++++--- usr/src/local/sccscmds/sccscmds.ok/cmd/prt.c | 10 ++-- .../local/sccscmds/sccscmds.ok/cmd/rmchg.c | 8 +-- .../local/sccscmds/sccscmds.ok/cmd/snull.c | 14 +++--- usr/src/local/sccscmds/sccscmds.ok/cmd/val.c | 50 +++++++++---------- 24 files changed, 188 insertions(+), 190 deletions(-) diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/admin.c b/usr/src/local/sccscmds/sccscmds.2/cmd/admin.c index 0fa982f359..07d5d9162b 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/admin.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/admin.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)admin.c 4.1); +static char Sccsid[] = "@(#)admin.c 4.2 %G%"; /* Program to create new SCCS files and change parameters @@ -33,9 +33,9 @@ char *ifile, *tfile; char *z; /* for validation program name */ char had[26], had_flag[26], rm_flag[26]; char *Comments, *Mrs; -char Valpgm[] "/usr/local/val"; +char Valpgm[] = "/usr/local/val"; int irel, fexists, num_files; -int VFLAG 0; +int VFLAG = 0; int Domrs; char *Sflags[]; char *anames[MAXNAMES], *enames[MAXNAMES]; @@ -232,8 +232,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'admin' routine for each file argument. @@ -514,7 +514,7 @@ char *afile; gpkt.p_wrttn = 1; /* don't write previous line */ - cp =+ 2; /* point to flag character */ + cp += 2; /* point to flag character */ k = *cp - 'a'; if (!had_flag[k] && !rm_flag[k]) { diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/bdiff.c b/usr/src/local/sccscmds/sccscmds.2/cmd/bdiff.c index 8e68f5ec02..63c20af70b 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/bdiff.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/bdiff.c @@ -1,6 +1,6 @@ # include "../hdr/defines.h" -SCCSID(@(#)bdiff.c 4.2); +static char Sccsid[] = "@(#)bdiff.c 4.3 %G%"; /* This program segments two files into pieces of <= seglim lines @@ -22,8 +22,8 @@ SCCSID(@(#)bdiff.c 4.2); int seglim; /* limit of size of file segment to be generated */ -char diff[] "/bin/diff"; -char tempskel[] "/tmp/bdXXXXX"; /* used to generate temp file names */ +char diff[] = "/bin/diff"; +char tempskel[] = "/tmp/bdXXXXX"; /* used to generate temp file names */ char tempfile[32]; char otmp[32], ntmp[32]; int linenum; @@ -66,13 +66,13 @@ char *argv[]; if (argc > 3) { if (argv[3][0] == '-' && argv[3][1] == 's') - Fflags =& ~FTLMSG; + Fflags &= ~FTLMSG; else { if ((seglim = patoi(argv[3])) == -1) fatal("non-numeric limit (bd4)"); if (argc == 5 && argv[4][0] == '-' && argv[4][1] == 's') - Fflags =& ~FTLMSG; + Fflags &= ~FTLMSG; } } @@ -226,7 +226,7 @@ char *argv[]; if (status&~0x100) fatal(sprintf(Error,"'%s' failed (bd6)",diff)); } - linenum =+ seglim; + linenum += seglim; /* Remove temporary files. @@ -300,7 +300,7 @@ char *lp; default: lp = satoi(lp,&num); - num =+ linenum; + num += linenum; printf("%d",num); } } diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/cmt.c b/usr/src/local/sccscmds/sccscmds.2/cmd/cmt.c index 990a22e3af..5a9c63a7e4 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/cmt.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/cmt.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)cmt.c 4.3); +static char Sccsid[] = "@(#)cmt.c 4.4 %G%"; struct packet gpkt; int num_files, had_ffile; @@ -9,7 +9,7 @@ int F_Opened, Opened, Domrs, First; char *Comments, *Mrs, *ffile; char Cstr[BUFSIZ], Mstr[BUFSIZ], Line[BUFSIZ], had[26]; FILE *iop, *Xiop; -static char ifde[] "initial file does not exists"; +static char ifde[] = "initial file does not exists"; main(argc,argv) int argc; @@ -58,8 +58,8 @@ register char *argv[]; Reset flags for 'fatal' so that it will return to 'main' rather than exiting. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Invoke 'cmt' for each file argument. @@ -72,9 +72,9 @@ register char *argv[]; } -static char s_warn[] "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n"; +static char s_warn[] = "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n"; -static char ns_warn[] "WARNING: MR flag is not set; `%s' should only contain comment line\n"; +static char ns_warn[] = "WARNING: MR flag is not set; `%s' should only contain comment line\n"; cmt(file) register char *file; @@ -158,13 +158,13 @@ register char *file; } -static char cle[] "comment line for initial delta already exists"; +static char cle[] = "comment line for initial delta already exists"; do_delt(pkt) register struct packet *pkt; { int n; - int did_zero 0; + int did_zero = 0; struct deltab dt; struct stats stats; diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/comb.c b/usr/src/local/sccscmds/sccscmds.2/cmd/comb.c index 96ec1ec6b3..2e743cd7d6 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/comb.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/comb.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)comb.c 4.2); +static char Sccsid[] = "@(#)comb.c 4.3 %G%"; USXALLOC(); struct packet gpkt; @@ -68,8 +68,8 @@ register char *argv[]; if (HADP && HADC) fatal("can't have both -p and -c (cb2)"); setsig(); - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; iop = stdout; for (i = 1; i < argc; i++) if (p=argv[i]) diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/delta.c b/usr/src/local/sccscmds/sccscmds.2/cmd/delta.c index 5473eec914..f10a6e50a8 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/delta.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/delta.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)delta.c 4.7); +static char Sccsid[] = "@(#)delta.c 4.8 %G%"; USXALLOC(); # ifdef LOGDELTA @@ -11,7 +11,7 @@ FILE *Logf; char Diffpgm[] = "/usr/local/bdiff"; FILE *Diffin; -int Debug 0; +int Debug = 0; struct packet gpkt; struct sid sid; int num_files; @@ -89,8 +89,8 @@ register char *argv[]; Logf = fopen(LogFile, "a"); # endif setsig(); - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; for (i=1; i -SCCSID(@(#)get.c 4.7); +static char Sccsid[] = "@(#)get.c 4.8 %G%"; -int Debug 0; +int Debug = 0; struct packet gpkt; struct sid sid; unsigned Ser; int num_files; char had[26]; char *ilist, *elist, *lfile; -long cutoff 0X7FFFFFFFL; /* max positive long */ +long cutoff = 0X7FFFFFFFL; /* max positive long */ int verbosity; char Gfile[MAXNAMLEN + 3]; char Mod[MAXNAMLEN + 3]; /* should be as large as Gfile? */ @@ -113,8 +113,8 @@ register char *argv[]; if (!HADS) verbosity = -1; setsig(); - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; for (i=1; ip_reqsid.s_br == 0) { - pkt->p_reqsid.s_lev =+ 1; + pkt->p_reqsid.s_lev += 1; if (sidtoser(&pkt->p_reqsid,pkt) || pkt->p_maxr > pkt->p_reqsid.s_rel || branch) { pkt->p_reqsid.s_rel = pkt->p_gotsid.s_rel; @@ -255,16 +255,16 @@ int branch; else if (pkt->p_reqsid.s_seq == 0 && !branch) pkt->p_reqsid.s_seq = pkt->p_gotsid.s_seq + 1; else { - pkt->p_reqsid.s_seq =+ 1; + pkt->p_reqsid.s_seq += 1; if (branch || sidtoser(&pkt->p_reqsid,pkt)) { - pkt->p_reqsid.s_br =+ 1; + pkt->p_reqsid.s_br += 1; pkt->p_reqsid.s_seq = 1; chkbr++; } } if (chkbr) while (sidtoser(&pkt->p_reqsid,pkt)) - pkt->p_reqsid.s_br =+ 1; + pkt->p_reqsid.s_br += 1; if (sidtoser(&pkt->p_reqsid,pkt)) fatal("internal error in newsid()"); } @@ -477,7 +477,7 @@ register char *old, *new; *new = '\0'; } -static char Zkeywd[5] "@(#)"; +static char Zkeywd[5] = "@(#)"; idsubst(pkt,line) diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/help.c b/usr/src/local/sccscmds/sccscmds.2/cmd/help.c index c60604b1cb..5e3f7c9169 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/help.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/help.c @@ -1,6 +1,6 @@ # include "../hdr/defines.h" -SCCSID(@(#)help.c 4.1); +static char Sccsid[] = "@(#)help.c 4.2 %G%"; /* Program to locate helpful info in an ascii file. @@ -39,8 +39,8 @@ SCCSID(@(#)help.c 4.1); If the argument is omitted, the program requests it. */ -char oldfile[] "/usr/local/lib/sccs.hf"; -char helpdir[] "/usr/local/lib/help/"; +char oldfile[] = "/usr/local/lib/sccs.hf"; +char helpdir[] = "/usr/local/lib/help/"; char hfile[64]; FILE *iop; char line [512]; diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/prs.c b/usr/src/local/sccscmds/sccscmds.2/cmd/prs.c index 78d6ca556c..9c31246e7b 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/prs.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/prs.c @@ -23,18 +23,17 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)prs.c 4.1); +static char Sccsid[] = "@(#)prs.c 4.2 %G%"; char had[26]; -char Getpgm[] "/usr/local/get"; +char Getpgm[] = "/usr/local/get"; char Sid[32]; char Mod[16]; char *Type; char Deltadate[18]; char *Deltatime; -char tempskel[] "/tmp/prXXXXXX"; /* used to generate temp - file names - */ +char tempskel[] = "/tmp/prXXXXXX"; /* used to generate temp file names */ + char untmp[32], uttmp[32], cmtmp[32]; char mrtmp[32], bdtmp[32]; FILE *UNiop; @@ -130,8 +129,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'prs' routine for each file argument. @@ -265,7 +264,7 @@ register struct packet *pkt; * immediately. */ -static char Zkeywd[5] "@(#)"; +static char Zkeywd[5] = "@(#)"; scanspec(spec,dtp,statp) char spec[]; struct deltab *dtp; @@ -350,7 +349,7 @@ struct stats *statp; else if(lp[0] == ':' && lp[1] != 0 && lp[2] !=0 && lp[3] == ':') { if (lp[1] == ':') { putchar(':'); - *lp =+ 2; + *lp += 2; continue; } u.str[1] = *++lp; @@ -734,7 +733,7 @@ struct packet *pkt; getit(str,cp) register char *str, *cp; { - cp =+ 2; + cp += 2; NONBLANK(cp); cp[length(cp) - 1] = '\0'; sprintf(str,"%s",cp); diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/prt.c b/usr/src/local/sccscmds/sccscmds.2/cmd/prt.c index ba252852a3..430d7c13eb 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/prt.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/prt.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)prt.c 4.1); +static char Sccsid[] = "@(#)prt.c 4.2 %G%"; /* Program to print parts or all of an SCCS file. @@ -38,7 +38,7 @@ long cutoff; long revcut; int linenum; char *ysid; -char *flagdesc[26] { "", +char *flagdesc[26] = { "", "branch", "ceiling", "default SID", @@ -145,8 +145,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'prt' routine for each file argument. @@ -336,7 +336,7 @@ getdel(delp,lp) register struct delent *delp; register char *lp; { - lp =+ 2; + lp += 2; NONBLANK(lp); delp->type = *lp++; NONBLANK(lp); diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/rmchg.c b/usr/src/local/sccscmds/sccscmds.2/cmd/rmchg.c index dda9776213..dc60e26a92 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/rmchg.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/rmchg.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)rmchg.c 4.2); +static char Sccsid[] = "@(#)rmchg.c 4.3 %G%"; /* Program to remove a specified delta from an SCCS file, @@ -92,8 +92,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'rmchg' routine for each file argument. @@ -130,7 +130,7 @@ USXALLOC(); /* defines alloc() and free() */ rmchg(file) char *file; { - static int first_time 1; + static int first_time = 1; struct deltab dt; /* see file s.defines.h */ struct stats stats; /* see file s.defines.h */ extern char *Sflags[]; diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/snull.c b/usr/src/local/sccscmds/sccscmds.2/cmd/snull.c index f0b849049b..0049d841c5 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/snull.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/snull.c @@ -1,10 +1,10 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)snull.c 4.3); +static char Sccsid[] = "@(#)snull.c 4.4 %G%"; USXALLOC(); -int Debug 0; +int Debug = 0; struct packet gpkt; struct sid sid; int num_files; @@ -69,8 +69,8 @@ register char *argv[]; Reset flags for 'fatal' so that it will return to 'main' rather than exiting. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Invoke 'snull' for each file argument. @@ -327,7 +327,7 @@ mkdelt() if (reldiff < 0) fatal("file has invalid trunk delta (sn1)"); - currel =+ reldiff; /* update currel */ + currel += reldiff; /* update currel */ /* Find pointer to ancestor delta. @@ -377,9 +377,9 @@ mkdelt() reldiff--; while (ptrtemp) { if (ptrtemp->ds_ser >= serhold) - ptrtemp->ds_ser =+ reldiff; + ptrtemp->ds_ser += reldiff; if (ptrtemp->ds_pred >= serhold) - ptrtemp->ds_pred =+ reldiff; + ptrtemp->ds_pred += reldiff; ptrtemp = ptrtemp->ds_youngerdel; } diff --git a/usr/src/local/sccscmds/sccscmds.2/cmd/val.c b/usr/src/local/sccscmds/sccscmds.2/cmd/val.c index 4f52437ea4..0e25d1537f 100644 --- a/usr/src/local/sccscmds/sccscmds.2/cmd/val.c +++ b/usr/src/local/sccscmds/sccscmds.2/cmd/val.c @@ -47,7 +47,7 @@ struct delent { /* structure for delta table entry */ char *pred; } del; -SCCSID(@(#)val.c 4.2); +static char Sccsid[] = "@(#)val.c 4.3 %G%"; /* This is the main program that determines whether the command line * comes from the standard input or read off the original command @@ -68,7 +68,7 @@ char *argv[]; if (line[0] != '\n') { repl (line,'\n','\0'); process(line); - ret_code =| inline_err; + ret_code |= inline_err; } } } @@ -126,7 +126,7 @@ char *p_line; testklt = 1; NONBLANK(p_line); if (*p_line == '-') { - p_line =+ 1; + p_line += 1; c = *p_line; p_line++; switch (c) { @@ -147,14 +147,14 @@ char *p_line; p_line = getval(p_line,name); break; default: - inline_err =| UNKDUP_ERR; + inline_err |= UNKDUP_ERR; } /* use 'had' array and determine if the keyletter was given twice. */ if (had[c - 'a']++ && testklt++) - inline_err =| UNKDUP_ERR; + inline_err |= UNKDUP_ERR; } else { /* @@ -168,7 +168,7 @@ char *p_line; check if any files were named as arguments */ if (num_files == 0) - inline_err =| FILARG_ERR; + inline_err |= FILARG_ERR; /* check for error in command line. */ @@ -188,7 +188,7 @@ char *p_line; */ sprintf(path,"%s",filelist[j]); validate(path,sid,type,name); - inline_err =| infile_err; + inline_err |= infile_err; /* check for error from 'validate' and call 'report' depending on 'silent' flag. @@ -223,14 +223,14 @@ char *c_name; infile_err = goods = goodt = goodn = hadmflag = 0; sinit(&gpkt,c_path); if (!sccsfile(c_path) || (gpkt.p_iop = fopen(c_path,"r")) == NULL) - infile_err =| FILENAM_ERR; + infile_err |= FILENAM_ERR; else { l = get_line(&gpkt); /* read first line in file */ /* check that it is header line. */ if (*l++ != CTLCHAR || *l++ != HEAD) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; else { /* @@ -243,14 +243,14 @@ char *c_name; check for invalid or ambiguous SID. */ if (invalid(c_sid)) - infile_err =| INVALSID_ERR; + infile_err |= INVALSID_ERR; /* read delta table checking for errors and/or SID. */ if (do_delt(&gpkt,goods,c_sid)) { fclose(gpkt.p_iop); - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return; } @@ -266,36 +266,36 @@ char *c_name; NONBLANK(l); repl(l,'\n','\0'); if (*l == TYPEFLAG) { - l =+ 2; + l += 2; if (equal(c_type,l)) goodt++; } else if (*l == MODFLAG) { hadmflag++; - l =+ 2; + l += 2; if (equal(c_name,l)) goodn++; } } if (*(--l) != BUSERTXT) { fclose(gpkt.p_iop); - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return; } /* check if 'y' flag matched '-y' arg value. */ if (!goodt && HADY) - infile_err =| TYPE_ERR; + infile_err |= TYPE_ERR; /* check if 'm' flag matched '-m' arg value. */ if (HADM && !hadmflag) { if (!equal(auxf(sname(c_path),'g'),c_name)) - infile_err =| NAME_ERR; + infile_err |= NAME_ERR; } else if (HADM && hadmflag && !goodn) - infile_err =| NAME_ERR; + infile_err |= NAME_ERR; } else read_to(BUSERTXT,&gpkt); read_to(EUSERTXT,&gpkt); @@ -456,13 +456,13 @@ register struct packet *pkt; if ((n = fgets(pkt->p_line,sizeof(pkt->p_line),pkt->p_iop)) != NULL) { pkt->p_slnno++; for (p = pkt->p_line; *p; ) - pkt->p_chash =+ *p++; + pkt->p_chash += *p++; } else { if (!pkt->p_chkeof) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; if (pkt->do_chksum && (pkt->p_chash ^ pkt->p_ihash)&0xFFFF) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; } return(n); } @@ -498,7 +498,7 @@ register struct packet *pkt; continue; else { if (!((iord = *p++) == INS || iord == DEL || iord == END)) { - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return(0); } NONBLANK(p); @@ -512,7 +512,7 @@ register struct packet *pkt; } } if (pkt->p_q) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return(0); } @@ -529,7 +529,7 @@ int iord; if (cur->q_sernum <= ser) break; if (cur->q_sernum == ser) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; prev->q_next = q = alloc(sizeof(*q)); q->q_next = cur; q->q_sernum = ser; @@ -562,7 +562,7 @@ int ser; setkeep(pkt); } else - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; } @@ -671,7 +671,7 @@ register char *d_sid; if (pkt->p_line[1] != BUSERNAM) return(1); if (HADR && !goods && !(infile_err & INVALSID_ERR)) - infile_err =| NONEXSID_ERR; + infile_err |= NONEXSID_ERR; return(0); } diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/admin.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/admin.c index 0fa982f359..07d5d9162b 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/admin.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/admin.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)admin.c 4.1); +static char Sccsid[] = "@(#)admin.c 4.2 %G%"; /* Program to create new SCCS files and change parameters @@ -33,9 +33,9 @@ char *ifile, *tfile; char *z; /* for validation program name */ char had[26], had_flag[26], rm_flag[26]; char *Comments, *Mrs; -char Valpgm[] "/usr/local/val"; +char Valpgm[] = "/usr/local/val"; int irel, fexists, num_files; -int VFLAG 0; +int VFLAG = 0; int Domrs; char *Sflags[]; char *anames[MAXNAMES], *enames[MAXNAMES]; @@ -232,8 +232,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'admin' routine for each file argument. @@ -514,7 +514,7 @@ char *afile; gpkt.p_wrttn = 1; /* don't write previous line */ - cp =+ 2; /* point to flag character */ + cp += 2; /* point to flag character */ k = *cp - 'a'; if (!had_flag[k] && !rm_flag[k]) { diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/bdiff.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/bdiff.c index 8e68f5ec02..63c20af70b 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/bdiff.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/bdiff.c @@ -1,6 +1,6 @@ # include "../hdr/defines.h" -SCCSID(@(#)bdiff.c 4.2); +static char Sccsid[] = "@(#)bdiff.c 4.3 %G%"; /* This program segments two files into pieces of <= seglim lines @@ -22,8 +22,8 @@ SCCSID(@(#)bdiff.c 4.2); int seglim; /* limit of size of file segment to be generated */ -char diff[] "/bin/diff"; -char tempskel[] "/tmp/bdXXXXX"; /* used to generate temp file names */ +char diff[] = "/bin/diff"; +char tempskel[] = "/tmp/bdXXXXX"; /* used to generate temp file names */ char tempfile[32]; char otmp[32], ntmp[32]; int linenum; @@ -66,13 +66,13 @@ char *argv[]; if (argc > 3) { if (argv[3][0] == '-' && argv[3][1] == 's') - Fflags =& ~FTLMSG; + Fflags &= ~FTLMSG; else { if ((seglim = patoi(argv[3])) == -1) fatal("non-numeric limit (bd4)"); if (argc == 5 && argv[4][0] == '-' && argv[4][1] == 's') - Fflags =& ~FTLMSG; + Fflags &= ~FTLMSG; } } @@ -226,7 +226,7 @@ char *argv[]; if (status&~0x100) fatal(sprintf(Error,"'%s' failed (bd6)",diff)); } - linenum =+ seglim; + linenum += seglim; /* Remove temporary files. @@ -300,7 +300,7 @@ char *lp; default: lp = satoi(lp,&num); - num =+ linenum; + num += linenum; printf("%d",num); } } diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/cmt.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/cmt.c index 990a22e3af..5a9c63a7e4 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/cmt.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/cmt.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)cmt.c 4.3); +static char Sccsid[] = "@(#)cmt.c 4.4 %G%"; struct packet gpkt; int num_files, had_ffile; @@ -9,7 +9,7 @@ int F_Opened, Opened, Domrs, First; char *Comments, *Mrs, *ffile; char Cstr[BUFSIZ], Mstr[BUFSIZ], Line[BUFSIZ], had[26]; FILE *iop, *Xiop; -static char ifde[] "initial file does not exists"; +static char ifde[] = "initial file does not exists"; main(argc,argv) int argc; @@ -58,8 +58,8 @@ register char *argv[]; Reset flags for 'fatal' so that it will return to 'main' rather than exiting. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Invoke 'cmt' for each file argument. @@ -72,9 +72,9 @@ register char *argv[]; } -static char s_warn[] "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n"; +static char s_warn[] = "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n"; -static char ns_warn[] "WARNING: MR flag is not set; `%s' should only contain comment line\n"; +static char ns_warn[] = "WARNING: MR flag is not set; `%s' should only contain comment line\n"; cmt(file) register char *file; @@ -158,13 +158,13 @@ register char *file; } -static char cle[] "comment line for initial delta already exists"; +static char cle[] = "comment line for initial delta already exists"; do_delt(pkt) register struct packet *pkt; { int n; - int did_zero 0; + int did_zero = 0; struct deltab dt; struct stats stats; diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/comb.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/comb.c index 96ec1ec6b3..2e743cd7d6 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/comb.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/comb.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)comb.c 4.2); +static char Sccsid[] = "@(#)comb.c 4.3 %G%"; USXALLOC(); struct packet gpkt; @@ -68,8 +68,8 @@ register char *argv[]; if (HADP && HADC) fatal("can't have both -p and -c (cb2)"); setsig(); - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; iop = stdout; for (i = 1; i < argc; i++) if (p=argv[i]) diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/delta.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/delta.c index 5473eec914..f10a6e50a8 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/delta.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/delta.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)delta.c 4.7); +static char Sccsid[] = "@(#)delta.c 4.8 %G%"; USXALLOC(); # ifdef LOGDELTA @@ -11,7 +11,7 @@ FILE *Logf; char Diffpgm[] = "/usr/local/bdiff"; FILE *Diffin; -int Debug 0; +int Debug = 0; struct packet gpkt; struct sid sid; int num_files; @@ -89,8 +89,8 @@ register char *argv[]; Logf = fopen(LogFile, "a"); # endif setsig(); - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; for (i=1; i -SCCSID(@(#)get.c 4.7); +static char Sccsid[] = "@(#)get.c 4.8 %G%"; -int Debug 0; +int Debug = 0; struct packet gpkt; struct sid sid; unsigned Ser; int num_files; char had[26]; char *ilist, *elist, *lfile; -long cutoff 0X7FFFFFFFL; /* max positive long */ +long cutoff = 0X7FFFFFFFL; /* max positive long */ int verbosity; char Gfile[MAXNAMLEN + 3]; char Mod[MAXNAMLEN + 3]; /* should be as large as Gfile? */ @@ -113,8 +113,8 @@ register char *argv[]; if (!HADS) verbosity = -1; setsig(); - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; for (i=1; ip_reqsid.s_br == 0) { - pkt->p_reqsid.s_lev =+ 1; + pkt->p_reqsid.s_lev += 1; if (sidtoser(&pkt->p_reqsid,pkt) || pkt->p_maxr > pkt->p_reqsid.s_rel || branch) { pkt->p_reqsid.s_rel = pkt->p_gotsid.s_rel; @@ -255,16 +255,16 @@ int branch; else if (pkt->p_reqsid.s_seq == 0 && !branch) pkt->p_reqsid.s_seq = pkt->p_gotsid.s_seq + 1; else { - pkt->p_reqsid.s_seq =+ 1; + pkt->p_reqsid.s_seq += 1; if (branch || sidtoser(&pkt->p_reqsid,pkt)) { - pkt->p_reqsid.s_br =+ 1; + pkt->p_reqsid.s_br += 1; pkt->p_reqsid.s_seq = 1; chkbr++; } } if (chkbr) while (sidtoser(&pkt->p_reqsid,pkt)) - pkt->p_reqsid.s_br =+ 1; + pkt->p_reqsid.s_br += 1; if (sidtoser(&pkt->p_reqsid,pkt)) fatal("internal error in newsid()"); } @@ -477,7 +477,7 @@ register char *old, *new; *new = '\0'; } -static char Zkeywd[5] "@(#)"; +static char Zkeywd[5] = "@(#)"; idsubst(pkt,line) diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/help.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/help.c index c60604b1cb..5e3f7c9169 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/help.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/help.c @@ -1,6 +1,6 @@ # include "../hdr/defines.h" -SCCSID(@(#)help.c 4.1); +static char Sccsid[] = "@(#)help.c 4.2 %G%"; /* Program to locate helpful info in an ascii file. @@ -39,8 +39,8 @@ SCCSID(@(#)help.c 4.1); If the argument is omitted, the program requests it. */ -char oldfile[] "/usr/local/lib/sccs.hf"; -char helpdir[] "/usr/local/lib/help/"; +char oldfile[] = "/usr/local/lib/sccs.hf"; +char helpdir[] = "/usr/local/lib/help/"; char hfile[64]; FILE *iop; char line [512]; diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/prs.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/prs.c index 78d6ca556c..9c31246e7b 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/prs.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/prs.c @@ -23,18 +23,17 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)prs.c 4.1); +static char Sccsid[] = "@(#)prs.c 4.2 %G%"; char had[26]; -char Getpgm[] "/usr/local/get"; +char Getpgm[] = "/usr/local/get"; char Sid[32]; char Mod[16]; char *Type; char Deltadate[18]; char *Deltatime; -char tempskel[] "/tmp/prXXXXXX"; /* used to generate temp - file names - */ +char tempskel[] = "/tmp/prXXXXXX"; /* used to generate temp file names */ + char untmp[32], uttmp[32], cmtmp[32]; char mrtmp[32], bdtmp[32]; FILE *UNiop; @@ -130,8 +129,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'prs' routine for each file argument. @@ -265,7 +264,7 @@ register struct packet *pkt; * immediately. */ -static char Zkeywd[5] "@(#)"; +static char Zkeywd[5] = "@(#)"; scanspec(spec,dtp,statp) char spec[]; struct deltab *dtp; @@ -350,7 +349,7 @@ struct stats *statp; else if(lp[0] == ':' && lp[1] != 0 && lp[2] !=0 && lp[3] == ':') { if (lp[1] == ':') { putchar(':'); - *lp =+ 2; + *lp += 2; continue; } u.str[1] = *++lp; @@ -734,7 +733,7 @@ struct packet *pkt; getit(str,cp) register char *str, *cp; { - cp =+ 2; + cp += 2; NONBLANK(cp); cp[length(cp) - 1] = '\0'; sprintf(str,"%s",cp); diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/prt.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/prt.c index ba252852a3..430d7c13eb 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/prt.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/prt.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)prt.c 4.1); +static char Sccsid[] = "@(#)prt.c 4.2 %G%"; /* Program to print parts or all of an SCCS file. @@ -38,7 +38,7 @@ long cutoff; long revcut; int linenum; char *ysid; -char *flagdesc[26] { "", +char *flagdesc[26] = { "", "branch", "ceiling", "default SID", @@ -145,8 +145,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'prt' routine for each file argument. @@ -336,7 +336,7 @@ getdel(delp,lp) register struct delent *delp; register char *lp; { - lp =+ 2; + lp += 2; NONBLANK(lp); delp->type = *lp++; NONBLANK(lp); diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/rmchg.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/rmchg.c index dda9776213..dc60e26a92 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/rmchg.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/rmchg.c @@ -1,7 +1,7 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)rmchg.c 4.2); +static char Sccsid[] = "@(#)rmchg.c 4.3 %G%"; /* Program to remove a specified delta from an SCCS file, @@ -92,8 +92,8 @@ char *argv[]; Change flags for 'fatal' so that it will return to this routine (main) instead of terminating processing. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Call 'rmchg' routine for each file argument. @@ -130,7 +130,7 @@ USXALLOC(); /* defines alloc() and free() */ rmchg(file) char *file; { - static int first_time 1; + static int first_time = 1; struct deltab dt; /* see file s.defines.h */ struct stats stats; /* see file s.defines.h */ extern char *Sflags[]; diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/snull.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/snull.c index f0b849049b..0049d841c5 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/snull.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/snull.c @@ -1,10 +1,10 @@ # include "../hdr/defines.h" # include "../hdr/had.h" -SCCSID(@(#)snull.c 4.3); +static char Sccsid[] = "@(#)snull.c 4.4 %G%"; USXALLOC(); -int Debug 0; +int Debug = 0; struct packet gpkt; struct sid sid; int num_files; @@ -69,8 +69,8 @@ register char *argv[]; Reset flags for 'fatal' so that it will return to 'main' rather than exiting. */ - Fflags =& ~FTLEXIT; - Fflags =| FTLJMP; + Fflags &= ~FTLEXIT; + Fflags |= FTLJMP; /* Invoke 'snull' for each file argument. @@ -327,7 +327,7 @@ mkdelt() if (reldiff < 0) fatal("file has invalid trunk delta (sn1)"); - currel =+ reldiff; /* update currel */ + currel += reldiff; /* update currel */ /* Find pointer to ancestor delta. @@ -377,9 +377,9 @@ mkdelt() reldiff--; while (ptrtemp) { if (ptrtemp->ds_ser >= serhold) - ptrtemp->ds_ser =+ reldiff; + ptrtemp->ds_ser += reldiff; if (ptrtemp->ds_pred >= serhold) - ptrtemp->ds_pred =+ reldiff; + ptrtemp->ds_pred += reldiff; ptrtemp = ptrtemp->ds_youngerdel; } diff --git a/usr/src/local/sccscmds/sccscmds.ok/cmd/val.c b/usr/src/local/sccscmds/sccscmds.ok/cmd/val.c index 4f52437ea4..0e25d1537f 100644 --- a/usr/src/local/sccscmds/sccscmds.ok/cmd/val.c +++ b/usr/src/local/sccscmds/sccscmds.ok/cmd/val.c @@ -47,7 +47,7 @@ struct delent { /* structure for delta table entry */ char *pred; } del; -SCCSID(@(#)val.c 4.2); +static char Sccsid[] = "@(#)val.c 4.3 %G%"; /* This is the main program that determines whether the command line * comes from the standard input or read off the original command @@ -68,7 +68,7 @@ char *argv[]; if (line[0] != '\n') { repl (line,'\n','\0'); process(line); - ret_code =| inline_err; + ret_code |= inline_err; } } } @@ -126,7 +126,7 @@ char *p_line; testklt = 1; NONBLANK(p_line); if (*p_line == '-') { - p_line =+ 1; + p_line += 1; c = *p_line; p_line++; switch (c) { @@ -147,14 +147,14 @@ char *p_line; p_line = getval(p_line,name); break; default: - inline_err =| UNKDUP_ERR; + inline_err |= UNKDUP_ERR; } /* use 'had' array and determine if the keyletter was given twice. */ if (had[c - 'a']++ && testklt++) - inline_err =| UNKDUP_ERR; + inline_err |= UNKDUP_ERR; } else { /* @@ -168,7 +168,7 @@ char *p_line; check if any files were named as arguments */ if (num_files == 0) - inline_err =| FILARG_ERR; + inline_err |= FILARG_ERR; /* check for error in command line. */ @@ -188,7 +188,7 @@ char *p_line; */ sprintf(path,"%s",filelist[j]); validate(path,sid,type,name); - inline_err =| infile_err; + inline_err |= infile_err; /* check for error from 'validate' and call 'report' depending on 'silent' flag. @@ -223,14 +223,14 @@ char *c_name; infile_err = goods = goodt = goodn = hadmflag = 0; sinit(&gpkt,c_path); if (!sccsfile(c_path) || (gpkt.p_iop = fopen(c_path,"r")) == NULL) - infile_err =| FILENAM_ERR; + infile_err |= FILENAM_ERR; else { l = get_line(&gpkt); /* read first line in file */ /* check that it is header line. */ if (*l++ != CTLCHAR || *l++ != HEAD) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; else { /* @@ -243,14 +243,14 @@ char *c_name; check for invalid or ambiguous SID. */ if (invalid(c_sid)) - infile_err =| INVALSID_ERR; + infile_err |= INVALSID_ERR; /* read delta table checking for errors and/or SID. */ if (do_delt(&gpkt,goods,c_sid)) { fclose(gpkt.p_iop); - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return; } @@ -266,36 +266,36 @@ char *c_name; NONBLANK(l); repl(l,'\n','\0'); if (*l == TYPEFLAG) { - l =+ 2; + l += 2; if (equal(c_type,l)) goodt++; } else if (*l == MODFLAG) { hadmflag++; - l =+ 2; + l += 2; if (equal(c_name,l)) goodn++; } } if (*(--l) != BUSERTXT) { fclose(gpkt.p_iop); - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return; } /* check if 'y' flag matched '-y' arg value. */ if (!goodt && HADY) - infile_err =| TYPE_ERR; + infile_err |= TYPE_ERR; /* check if 'm' flag matched '-m' arg value. */ if (HADM && !hadmflag) { if (!equal(auxf(sname(c_path),'g'),c_name)) - infile_err =| NAME_ERR; + infile_err |= NAME_ERR; } else if (HADM && hadmflag && !goodn) - infile_err =| NAME_ERR; + infile_err |= NAME_ERR; } else read_to(BUSERTXT,&gpkt); read_to(EUSERTXT,&gpkt); @@ -456,13 +456,13 @@ register struct packet *pkt; if ((n = fgets(pkt->p_line,sizeof(pkt->p_line),pkt->p_iop)) != NULL) { pkt->p_slnno++; for (p = pkt->p_line; *p; ) - pkt->p_chash =+ *p++; + pkt->p_chash += *p++; } else { if (!pkt->p_chkeof) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; if (pkt->do_chksum && (pkt->p_chash ^ pkt->p_ihash)&0xFFFF) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; } return(n); } @@ -498,7 +498,7 @@ register struct packet *pkt; continue; else { if (!((iord = *p++) == INS || iord == DEL || iord == END)) { - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return(0); } NONBLANK(p); @@ -512,7 +512,7 @@ register struct packet *pkt; } } if (pkt->p_q) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; return(0); } @@ -529,7 +529,7 @@ int iord; if (cur->q_sernum <= ser) break; if (cur->q_sernum == ser) - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; prev->q_next = q = alloc(sizeof(*q)); q->q_next = cur; q->q_sernum = ser; @@ -562,7 +562,7 @@ int ser; setkeep(pkt); } else - infile_err =| CORRUPT_ERR; + infile_err |= CORRUPT_ERR; } @@ -671,7 +671,7 @@ register char *d_sid; if (pkt->p_line[1] != BUSERNAM) return(1); if (HADR && !goods && !(infile_err & INVALSID_ERR)) - infile_err =| NONEXSID_ERR; + infile_err |= NONEXSID_ERR; return(0); } -- 2.20.1