This commit was generated by cvs2svn to compensate for changes in r61521,

which included commits to RCS files with non-trunk default branches.
This commit is contained in:
David E. O'Brien 2000-06-10 22:07:54 +00:00
commit b20d27d6f8
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=61522
2 changed files with 7 additions and 5 deletions

View file

@ -1,4 +1,4 @@
/* $Header: /src/pub/tcsh/sh.dol.c,v 3.39 2000/01/14 22:57:27 christos Exp $ */ /* $Header: /src/pub/tcsh/sh.dol.c,v 3.40 2000/06/10 21:36:06 kim Exp $ */
/* /*
* sh.dol.c: Variable substitutions * sh.dol.c: Variable substitutions
*/ */
@ -36,7 +36,7 @@
*/ */
#include "sh.h" #include "sh.h"
RCSID("$Id: sh.dol.c,v 3.39 2000/01/14 22:57:27 christos Exp $") RCSID("$Id: sh.dol.c,v 3.40 2000/06/10 21:36:06 kim Exp $")
/* /*
* C shell * C shell
@ -225,7 +225,9 @@ Dpack(wbuf, wp)
Gcat(STRNULL, wbuf); Gcat(STRNULL, wbuf);
return (NULL); return (NULL);
} }
#if defined(DSPMBYTE)
mbyteskip: mbyteskip:
#endif /* DSPMBYTE */
if (--i <= 0) if (--i <= 0)
stderror(ERR_WTOOLONG); stderror(ERR_WTOOLONG);
*wp++ = (Char) c; *wp++ = (Char) c;

View file

@ -1,4 +1,4 @@
/* $Header: /src/pub/tcsh/sh.time.c,v 3.21 2000/01/14 22:57:29 christos Exp $ */ /* $Header: /src/pub/tcsh/sh.time.c,v 3.22 2000/06/10 21:35:41 kim Exp $ */
/* /*
* sh.time.c: Shell time keeping and printing. * sh.time.c: Shell time keeping and printing.
*/ */
@ -36,7 +36,7 @@
*/ */
#include "sh.h" #include "sh.h"
RCSID("$Id: sh.time.c,v 3.21 2000/01/14 22:57:29 christos Exp $") RCSID("$Id: sh.time.c,v 3.22 2000/06/10 21:35:41 kim Exp $")
#ifdef SUNOS4 #ifdef SUNOS4
# include <machine/param.h> # include <machine/param.h>
@ -457,7 +457,7 @@ prusage(bs, es, e, b)
sysinfo.cpu_count = 1; sysinfo.cpu_count = 1;
i = (ms == 0) ? 0 : (t * 1000.0 / (ms * sysinfo.cpu_count)); i = (ms == 0) ? 0 : (t * 1000.0 / (ms * sysinfo.cpu_count));
#else /* convex */ #else /* convex */
i = (ms == 0) ? 0 : (t * 1000.0 / ms); i = (ms == 0) ? 0 : (long)(t * 1000.0 / ms);
#endif /* convex */ #endif /* convex */
xprintf("%ld.%01ld%%", i / 10, i % 10); /* nn.n% */ xprintf("%ld.%01ld%%", i / 10, i % 10); /* nn.n% */
break; break;