BSD 4_3_Net_2 release

[unix-history] / usr / src / games / monop / execute.c

diff --git a/usr/src/games/monop/execute.c b/usr/src/games/monop/execute.c
index a572986..9b8889e 100644 (file)
--- a/usr/src/games/monop/execute.c
+++ b/usr/src/games/monop/execute.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)execute.c  5.4 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)execute.c  5.5 (Berkeley) 2/28/91";

 #endif /* not lint */
 
 # include      "monop.ext"
 #endif /* not lint */
 
 # include      "monop.ext"


@@ -149,11 +163,11 @@ save() {
 
        reg char        *sp;
        reg int         outf, num;
 
        reg char        *sp;
        reg int         outf, num;

-       TIME            tme, *tp;
-       int             *dat_end, junk[18];
+       time_t          t;
+       int             *dat_end;
+       struct stat     sb;

        unsgn           start, end;
 
        unsgn           start, end;
 

-       tp = &tme;

        printf("Which file do you wish to save it in? ");
        sp = buf;
        while ((*sp++=getchar()) != '\n')
        printf("Which file do you wish to save it in? ");
        sp = buf;
        while ((*sp++=getchar()) != '\n')


@@ -164,7 +178,7 @@ save() {
         * check for existing files, and confirm overwrite if needed
         */
 
         * check for existing files, and confirm overwrite if needed
         */
 

-       if (stat(buf, junk) > -1
+       if (stat(buf, &sb) > -1

            && getyn("File exists.  Do you wish to overwrite? ", yn_only) > 0)
                return;
 
            && getyn("File exists.  Do you wish to overwrite? ", yn_only) > 0)
                return;
 


@@ -173,8 +187,8 @@ save() {
                return;
        }
        printf("\"%s\" ", buf);
                return;
        }
        printf("\"%s\" ", buf);

-       time(tp);                       /* get current time             */
-       strcpy(buf, ctime(tp));
+       time(&t);                       /* get current time             */
+       strcpy(buf, ctime(&t));

        for (sp = buf; *sp != '\n'; sp++)
                continue;
        *sp = '\0';
        for (sp = buf; *sp != '\n'; sp++)
                continue;
        *sp = '\0';


@@ -239,7 +253,7 @@ reg char    *file; {
                start += num;
        }
        close(inf);
                start += num;
        }
        close(inf);

-       strcpy(buf, ctime(sbuf.st_mtime));
+       strcpy(buf, ctime(&sbuf.st_mtime));

        for (sp = buf; *sp != '\n'; sp++)
                continue;
        *sp = '\0';
        for (sp = buf; *sp != '\n'; sp++)
                continue;
        *sp = '\0';