shell_cmds-55.tar.gz

diff --git a/expr/expr.c b/expr/expr.c
index 53234270503fdf52c3f66ffc535c466dc623d12d..4732044b8bf2efd42b8430a56a523d590f0a7bee 100644 (file)
--- a/expr/expr.c
+++ b/expr/expr.c
@@ -27,7 +27,7 @@ struct val {
 
        union {
                char           *s;
 
        union {
                char           *s;

-               int             i;
+               int64_t             i;

        } u;
 };
 
        } u;
 };
 


@@ -35,10 +35,10 @@ enum token  token;
 struct val     *tokval;
 char          **av;
 
 struct val     *tokval;
 char          **av;
 

-struct val *make_int __P((int));
+struct val *make_int __P((int64_t));

 struct val *make_str __P((char *));
 void free_value __P((struct val *));
 struct val *make_str __P((char *));
 void free_value __P((struct val *));

-int is_integer __P((struct val *, int *));
+int is_integer __P((struct val *, int64_t *));

 int to_integer __P((struct val *));
 void to_string __P((struct val *));
 int is_zero_or_null __P((struct val *));
 int to_integer __P((struct val *));
 void to_string __P((struct val *));
 int is_zero_or_null __P((struct val *));


@@ -56,7 +56,7 @@ int main __P((int, char **));
 
 struct val *
 make_int(i)
 
 struct val *
 make_int(i)

-       int             i;
+       int64_t             i;

 {
        struct val     *vp;
 
 {
        struct val     *vp;
 


@@ -99,11 +99,11 @@ free_value(vp)
 int
 is_integer(vp, r)
        struct val     *vp;
 int
 is_integer(vp, r)
        struct val     *vp;

-       int            *r;
+       int64_t        *r;

 {
        char           *s;
        int             neg;
 {
        char           *s;
        int             neg;

-       int             i;
+       int64_t             i;

 
        if (vp->type == integer) {
                *r = vp->u.i;
 
        if (vp->type == integer) {
                *r = vp->u.i;


@@ -144,7 +144,7 @@ int
 to_integer(vp)
        struct val     *vp;
 {
 to_integer(vp)
        struct val     *vp;
 {

-       int             r;
+       int64_t             r;

 
        if (vp->type == integer)
                return 1;
 
        if (vp->type == integer)
                return 1;


@@ -170,11 +170,11 @@ to_string(vp)
        if (vp->type == string)
                return;
 
        if (vp->type == string)
                return;
 

-       tmp = malloc(25);
+       tmp = malloc(100);

        if (tmp == NULL) {
                err(2, "%s", "");
        }
        if (tmp == NULL) {
                err(2, "%s", "");
        }

-       (void)snprintf(tmp, 25, "%d", vp->u.i);
+       (void)snprintf(tmp, 100, "%lld", vp->u.i);

        vp->type = string;
        vp->u.s = tmp;
 }
        vp->type = string;
        vp->u.s = tmp;
 }


@@ -384,7 +384,7 @@ eval2()
        struct val     *l, *r;
        enum token      op;
        int             v = 0;  /* pacify gcc */
        struct val     *l, *r;
        enum token      op;
        int             v = 0;  /* pacify gcc */

-       int             li, ri;
+       int64_t         li, ri;

 
        l = eval3();
        while ((op = token) == EQ || op == NE || op == LT || op == GT || op == LE || op == GE) {
 
        l = eval3();
        while ((op = token) == EQ || op == NE || op == LT || op == GT || op == LE || op == GE) {


@@ -539,7 +539,7 @@ main(argc, argv)
                error();
 
        if (vp->type == integer)
                error();
 
        if (vp->type == integer)

-               (void)printf("%d\n", vp->u.i);
+               (void)printf("%lld\n", vp->u.i);

        else
                (void)printf("%s\n", vp->u.s);
 
        else
                (void)printf("%s\n", vp->u.s);
 

diff --git a/pwd/pwd.c b/pwd/pwd.c
index bdd80bdaebcaabffdf096921c998606defd874b6..1bf8c394198722f4291f333934633231fa18eae8 100644 (file)
--- a/pwd/pwd.c
+++ b/pwd/pwd.c
@@ -60,18 +60,6 @@ char *getcwd_logical __P((char *, size_t));
 void  usage __P((void));
 int   main __P((int, char *[]));
 
 void  usage __P((void));
 int   main __P((int, char *[]));
 

-#ifdef __APPLE__
-char
-*getcwd_physical(pt, size)
-       char *pt;
-       size_t size;
-{
-       unsetenv("PWD");
-       return getcwd(pt, size);
-}
-#define getcwd getcwd_physical
-#endif
-

 int
 main(argc, argv)
        int argc;
 int
 main(argc, argv)
        int argc;

diff --git a/sleep/sleep.c b/sleep/sleep.c
index 7f0203a36f6c560220a4d8ae5f3d750262e66f52..87785b9772e8b8c81870f32747b81ed814aa1217 100644 (file)
--- a/sleep/sleep.c
+++ b/sleep/sleep.c
@@ -65,14 +65,10 @@ main(argc, argv)
        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {

-#ifndef __APPLE__

        char *arg, *temp;
        double val, ival, fval;
        struct timespec ntime;
        int fracflag;
        char *arg, *temp;
        double val, ival, fval;
        struct timespec ntime;
        int fracflag;

-#else
-        int secs;
-#endif

        int ch;
 
        (void)setlocale(LC_ALL, "");
        int ch;
 
        (void)setlocale(LC_ALL, "");


@@ -91,10 +87,6 @@ main(argc, argv)
        if (argc != 1)
                usage();
 
        if (argc != 1)
                usage();
 

-#ifdef __APPLE__
-        if ((secs = atoi(*argv)) > 0)
-                       (void)sleep(secs);
-#else

        /*
         * Okay, why not just use atof for everything? Why bother
         * checking if there is a fraction in use? Because the old
        /*
         * Okay, why not just use atof for everything? Why bother
         * checking if there is a fraction in use? Because the old


@@ -130,7 +122,6 @@ main(argc, argv)
        }
 
        (void)nanosleep(&ntime, NULL);
        }
 
        (void)nanosleep(&ntime, NULL);

-#endif

 
        exit(0);
        /* NOTREACHED */
 
        exit(0);
        /* NOTREACHED */