cleanups from sun

SCCS-vsn: bin/csh/alloc.c 4.2
SCCS-vsn: bin/csh/func.c 4.8
SCCS-vsn: bin/csh/csh.h 4.7
SCCS-vsn: bin/csh/lex.c 4.2
SCCS-vsn: bin/csh/proc.h 4.4

diff --git a/usr/src/bin/csh/alloc.c b/usr/src/bin/csh/alloc.c
index bf80f96..fc1c9fa 100644 (file)
--- a/usr/src/bin/csh/alloc.c
+++ b/usr/src/bin/csh/alloc.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)alloc.c 4.1 %G%";
+static char *sccsid = "@(#)alloc.c 4.2 %G%";

 
 #include "sh.local.h"
 #ifdef debug
 
 #include "sh.local.h"
 #ifdef debug


@@ -211,6 +211,6 @@ showall(v)
                i = ((unsigned) q - (unsigned) p);
                if (testbusy(p->ptr)) used += i; else free += i;
        }
                i = ((unsigned) q - (unsigned) p);
                if (testbusy(p->ptr)) used += i; else free += i;
        }

-       printf("%d used, %d free, %l end\n", used, free, clearbusy(alloct));
+       printf("%d used, %d free, %ld end\n", used, free, clearbusy(alloct));

 }
 #endif
 }
 #endif

diff --git a/usr/src/bin/csh/csh.h b/usr/src/bin/csh/csh.h
index 69d77e1..5948e50 100644 (file)
--- a/usr/src/bin/csh/csh.h
+++ b/usr/src/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/* csh.h 4.6 83/02/03 */
+/* csh.h 4.7 83/02/09 */

 
 #include "sh.local.h"
 #include <time.h>
 
 #include "sh.local.h"
 #include <time.h>


@@ -66,10 +66,10 @@ struct      rusage ru0;
 char   *doldol;                /* Character pid for $$ */
 int    uid;                    /* Invokers uid */
 time_t chktim;                 /* Time mail last checked */
 char   *doldol;                /* Character pid for $$ */
 int    uid;                    /* Invokers uid */
 time_t chktim;                 /* Time mail last checked */

-short  shpgrp;                 /* Pgrp of shell */
-short  tpgrp;                  /* Terminal process group */
+int    shpgrp;                 /* Pgrp of shell */
+int    tpgrp;                  /* Terminal process group */

 /* If tpgrp is -1, leave tty alone! */
 /* If tpgrp is -1, leave tty alone! */

-short  opgrp;                  /* Initial pgrp and tty pgrp */
+int    opgrp;                  /* Initial pgrp and tty pgrp */

 int    oldisc;                 /* Initial line discipline or -1 */
 struct tms shtimes;            /* shell and child times for process timing */
 
 int    oldisc;                 /* Initial line discipline or -1 */
 struct tms shtimes;            /* shell and child times for process timing */
 

diff --git a/usr/src/bin/csh/func.c b/usr/src/bin/csh/func.c
index 0646e09..ee6f1fe 100644 (file)
--- a/usr/src/bin/csh/func.c
+++ b/usr/src/bin/csh/func.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)func.c 4.7 82/12/30";
+static char *sccsid = "@(#)func.c 4.8 83/02/09";

 
 #include "sh.h"
 #include <sys/ioctl.h>
 
 #include "sh.h"
 #include <sys/ioctl.h>


@@ -1001,7 +1001,7 @@ setlim(lp, limit)
 dosuspend()
 {
        int old, ldisc;
 dosuspend()
 {
        int old, ldisc;

-       short ctpgrp;
+       int ctpgrp;

 
        if (loginsh)
                error("Can't suspend a login shell (yet)");
 
        if (loginsh)
                error("Can't suspend a login shell (yet)");

diff --git a/usr/src/bin/csh/lex.c b/usr/src/bin/csh/lex.c
index 6b3802e..0f9f81a 100644 (file)
--- a/usr/src/bin/csh/lex.c
+++ b/usr/src/bin/csh/lex.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)lex.c 4.1 %G%";
+static char *sccsid = "@(#)lex.c 4.2 %G%";

 
 #include "sh.h"
 
 
 #include "sh.h"
 


@@ -1133,7 +1133,7 @@ reread:
                                return (-1);
                        /* was isatty but raw with ignoreeof yields problems */
                        if (ioctl(SHIN, TIOCGETP, &tty)==0 && (tty.sg_flags & RAW) == 0) {
                                return (-1);
                        /* was isatty but raw with ignoreeof yields problems */
                        if (ioctl(SHIN, TIOCGETP, &tty)==0 && (tty.sg_flags & RAW) == 0) {

-                               short ctpgrp;
+                               int ctpgrp;

 
                                if (++sincereal > 25)
                                        goto oops;
 
                                if (++sincereal > 25)
                                        goto oops;

diff --git a/usr/src/bin/csh/proc.h b/usr/src/bin/csh/proc.h
index 45e965e..a2a7b64 100644 (file)
--- a/usr/src/bin/csh/proc.h
+++ b/usr/src/bin/csh/proc.h
@@ -1,4 +1,4 @@
-/* proc.h 4.3 %G% */
+/* proc.h 4.4 %G% */

 
 /*
  * C shell - process structure declarations
 
 /*
  * C shell - process structure declarations


@@ -19,8 +19,8 @@ struct process        {
        short   unsigned p_flags;       /* various job status flags */
        char    p_reason;               /* reason for entering this state */
        char    p_index;                /* shorthand job index */
        short   unsigned p_flags;       /* various job status flags */
        char    p_reason;               /* reason for entering this state */
        char    p_index;                /* shorthand job index */

-       short   p_pid;
-       short   p_jobid;                /* pid of job leader */
+       int     p_pid;
+       int     p_jobid;                /* pid of job leader */

        /* if a job is stopped/background p_jobid gives its pgrp */
        struct  timeval p_btime;        /* begin time */
        struct  timeval p_etime;        /* end time */
        /* if a job is stopped/background p_jobid gives its pgrp */
        struct  timeval p_btime;        /* begin time */
        struct  timeval p_etime;        /* end time */