trace to ./trace not $HOME/.trace

SCCS-vsn: bin/sh/show.c 5.3

diff --git a/usr/src/bin/sh/show.c b/usr/src/bin/sh/show.c
index cd83791..0f6b555 100644 (file)
--- a/usr/src/bin/sh/show.c
+++ b/usr/src/bin/sh/show.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *

- * %sccs.include.redist.c%
+ * 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[] = "@(#)show.c     5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)show.c     5.2 (Berkeley) 4/12/91";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -326,14 +352,18 @@ opentrace() {
 #ifdef DEBUG
        if (!debug)
                return;
 #ifdef DEBUG
        if (!debug)
                return;

+#ifdef not_this_way

        if ((p = getenv("HOME")) == NULL) {
        if ((p = getenv("HOME")) == NULL) {

-               if (getuid() == 0)
+               if (geteuid() == 0)

                        p = "/";
                else
                        p = "/tmp";
        }
        scopy(p, s);
        strcat(s, "/trace");
                        p = "/";
                else
                        p = "/tmp";
        }
        scopy(p, s);
        strcat(s, "/trace");

+#else
+       scopy("./trace", s);
+#endif /* not_this_way */

        if ((tracefile = fopen(s, "a")) == NULL) {
                fprintf(stderr, "Can't open %s\n", s);
                return;
        if ((tracefile = fopen(s, "a")) == NULL) {
                fprintf(stderr, "Can't open %s\n", s);
                return;


@@ -344,5 +374,5 @@ opentrace() {
 #endif
        fputs("\nTracing started.\n", tracefile);
        fflush(tracefile);
 #endif
        fputs("\nTracing started.\n", tracefile);
        fflush(tracefile);

-#endif
+#endif /* DEBUG */

 }
 }