From 635bdac720f3ce98f2cb3901947ba9098fd5f0a8 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Sun, 24 Feb 2008 15:57:20 +0000
Subject: [PATCH] another one from debian: '.' needs an argument

---
 check.t | 12 +++++++++++-
 funcs.c | 18 ++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/check.t b/check.t
index 3964ade..7d33bb0 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.143 2008/02/24 15:48:42 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.144 2008/02/24 15:57:20 tg Exp $
 # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
 # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@@ -4159,3 +4159,13 @@ stdin:
 expected-stdout:
 	<däÛÛ€Û@>
 ---
+name: dot-needs-argument
+description:
+	check Debian #415167 solution: '.' without arguments should fail
+stdin:
+	"$0" -c .
+	"$0" -c source
+expected-exit: e != 0
+expected-stderr-pattern:
+	/\.: missing argument.*\n.*\.: missing argument/
+---
diff --git a/funcs.c b/funcs.c
index 74fed89..00f84f3 100644
--- a/funcs.c
+++ b/funcs.c
@@ -5,7 +5,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.68 2008/02/24 15:48:42 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.69 2008/02/24 15:57:20 tg Exp $");
 
 /* A leading = means assignments before command are kept;
  * a leading * means a POSIX special builtin;
@@ -1680,7 +1680,7 @@ c_umask(const char **wp)
 		}
 		umask(new_umask);
 	}
-	return 0;
+	return (0);
 }
 
 int
@@ -1694,14 +1694,16 @@ c_dot(const char **wp)
 	int err;
 
 	if (ksh_getopt(wp, &builtin_opt, null) == '?')
-		return 1;
+		return (1);
 
-	if ((cp = wp[builtin_opt.optind]) == NULL)
-		return 0;
+	if ((cp = wp[builtin_opt.optind]) == NULL) {
+		bi_errorf("missing argument");
+		return (1);
+	}
 	file = search(cp, path, R_OK, &err);
 	if (file == NULL) {
 		bi_errorf("%s: %s", cp, err ? strerror(err) : "not found");
-		return 1;
+		return (1);
 	}
 
 	/* Set positional parameters? */
@@ -1717,9 +1719,9 @@ c_dot(const char **wp)
 	i = include(file, argc, argv, 0);
 	if (i < 0) { /* should not happen */
 		bi_errorf("%s: %s", cp, strerror(errno));
-		return 1;
+		return (1);
 	}
-	return i;
+	return (i);
 }
 
 int