Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/csh Fix the build for variants that do not define EDIT.



details:   https://anonhg.NetBSD.org/src/rev/a17f2c455ba8
branches:  trunk
changeset: 370070:a17f2c455ba8
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Sep 15 11:35:06 2022 +0000

description:
Fix the build for variants that do not define EDIT.

diffstat:

 bin/csh/csh.c    |  6 ++++--
 bin/csh/extern.h |  4 +++-
 bin/csh/set.c    |  8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (92 lines):

diff -r 695f05b7a944 -r a17f2c455ba8 bin/csh/csh.c
--- a/bin/csh/csh.c     Thu Sep 15 06:44:18 2022 +0000
+++ b/bin/csh/csh.c     Thu Sep 15 11:35:06 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.55 2022/09/14 17:06:16 christos Exp $ */
+/* $NetBSD: csh.c,v 1.56 2022/09/15 11:35:06 martin Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)csh.c      8.2 (Berkeley) 10/12/93";
 #else
-__RCSID("$NetBSD: csh.c,v 1.55 2022/09/14 17:06:16 christos Exp $");
+__RCSID("$NetBSD: csh.c,v 1.56 2022/09/15 11:35:06 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -1139,7 +1139,9 @@
            pnote();
        if (intty && prompt && evalvec == 0) {
            mailchk();
+#ifdef EDIT
            updateediting();
+#endif
            /*
             * If we are at the end of the input buffer then we are going to
             * read fresh stuff. Otherwise, we are rereading input and don't
diff -r 695f05b7a944 -r a17f2c455ba8 bin/csh/extern.h
--- a/bin/csh/extern.h  Thu Sep 15 06:44:18 2022 +0000
+++ b/bin/csh/extern.h  Thu Sep 15 11:35:06 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.33 2022/09/14 16:15:51 christos Exp $ */
+/* $NetBSD: extern.h,v 1.34 2022/09/15 11:35:06 martin Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -291,7 +291,9 @@
 void setNS(Char *);
 void shift(Char **, struct command *);
 void plist(struct varent *);
+#ifdef EDIT
 void updateediting(void);
+#endif
 
 /*
  * time.c
diff -r 695f05b7a944 -r a17f2c455ba8 bin/csh/set.c
--- a/bin/csh/set.c     Thu Sep 15 06:44:18 2022 +0000
+++ b/bin/csh/set.c     Thu Sep 15 11:35:06 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: set.c,v 1.39 2022/09/14 16:15:51 christos Exp $ */
+/* $NetBSD: set.c,v 1.40 2022/09/15 11:35:06 martin Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)set.c      8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: set.c,v 1.39 2022/09/14 16:15:51 christos Exp $");
+__RCSID("$NetBSD: set.c,v 1.40 2022/09/15 11:35:06 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,9 +59,9 @@
 static void exportpath(Char **);
 static void balance(struct varent *, int, int);
 
+#ifdef EDIT
 static int wantediting;
 
-#ifdef EDIT
 static const char *
 alias_text(void *dummy __unused, const char *name)
 {
@@ -555,6 +555,7 @@
 #endif
 }
 
+#ifdef EDIT
 extern int insource;
 void
 updateediting(void)
@@ -590,6 +591,7 @@
     }
     editing = wantediting;
 }
+#endif
 
 void
 unset1(Char *v[], struct varent *head)



Home | Main Index | Thread Index | Old Index