From 8945a121d3fae94a27a7d83ab21e5826e9515d36 Mon Sep 17 00:00:00 2001
From: herbert <herbert@gondor.apana.org.au>
Date: Thu, 3 Mar 2005 21:46:35 +1100
Subject: Removed qflag.

---
 ChangeLog     |  4 ++++
 src/dash.1    | 12 ------------
 src/main.c    | 15 ---------------
 src/options.c |  2 --
 src/options.h |  7 +++----
 5 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e609421..8579a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-03  Herbert Xu <herbert@gondor.apana.org.au>
+
+	* Removed qflag.
+
 2005-03-02  Herbert Xu <herbert@gondor.apana.org.au>
 
 	* Renamed symbols to avoid conflict with libc.
diff --git a/src/dash.1 b/src/dash.1
index 55c693d..61fe00a 100644
--- a/src/dash.1
+++ b/src/dash.1
@@ -234,18 +234,6 @@ Write each command to standard error (preceded by a
 .Sq +\  )
 before it is executed.
 Useful for debugging.
-.It Fl q Em quietprofile
-If the
-.Fl v
-or
-.Fl x
-options have been set, do not apply them when reading
-initialization files, these being
-.Pa /etc/profile ,
-.Pa .profile ,
-and the file specified by the
-.Ev ENV
-environment variable.
 .It Fl I Em ignoreeof
 Ignore EOF's from input when interactive.
 .It Fl i Em interactive
diff --git a/src/main.c b/src/main.c
index 76a75f7..f418cc5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -271,8 +271,6 @@ STATIC void
 read_profile(const char *name)
 {
 	int fd;
-	int xflag_set = 0;
-	int vflag_set = 0;
 
 	INTOFF;
 	if ((fd = open(name, O_RDONLY)) >= 0)
@@ -280,20 +278,7 @@ read_profile(const char *name)
 	INTON;
 	if (fd < 0)
 		return;
-	/* -q turns off -x and -v just when executing init files */
-	if (qflag)  {
-	    if (xflag)
-		    xflag = 0, xflag_set = 1;
-	    if (vflag)
-		    vflag = 0, vflag_set = 1;
-	}
 	cmdloop(0);
-	if (qflag)  {
-	    if (xflag_set)
-		    xflag = 1;
-	    if (vflag_set)
-		    vflag = 1;
-	}
 	popfile();
 }
 
diff --git a/src/options.c b/src/options.c
index e8c0717..aadd2db 100644
--- a/src/options.c
+++ b/src/options.c
@@ -92,7 +92,6 @@ static const char *const optnames[NOPTS] = {
 	"allexport",
 	"notify",
 	"nounset",
-	"quietprofile",
 	"nolog",
 	"debug",
 };
@@ -113,7 +112,6 @@ const char optletters[NOPTS] = {
 	'a',
 	'b',
 	'u',
-	'q',
 	0,
 	0,
 };
diff --git a/src/options.h b/src/options.h
index e5a06de..7d91768 100644
--- a/src/options.h
+++ b/src/options.h
@@ -63,11 +63,10 @@ struct shparam {
 #define	aflag optlist[12]
 #define	bflag optlist[13]
 #define	uflag optlist[14]
-#define	qflag optlist[15]
-#define	nolog optlist[16]
-#define	debug optlist[17]
+#define	nolog optlist[15]
+#define	debug optlist[16]
 
-#define NOPTS	18
+#define NOPTS	17
 
 extern const char optletters[NOPTS];
 extern char optlist[NOPTS];
-- 
cgit 1.4.1