summaryrefslogtreecommitdiff
path: root/builtins.c
diff options
context:
space:
mode:
authorToby Goodwin <toby@paccrat.org>2014-09-02 08:01:39 +0100
committerToby Goodwin <toby@paccrat.org>2015-05-16 21:22:10 +0100
commita8699a58d8632f21e897ea5c4900a15483a9a8ca (patch)
treefd8e7910807eb91bcd79d498582959f1d750f9c6 /builtins.c
parentd884971193ef4934424b77ae862e8b0ecf70bab3 (diff)
release: rc-1.7.2
Diffstat (limited to 'builtins.c')
-rw-r--r--builtins.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/builtins.c b/builtins.c
index ea708b6..75ac9cf 100644
--- a/builtins.c
+++ b/builtins.c
@@ -15,6 +15,7 @@
#include <errno.h>
#include "addon.h"
+#include "input.h"
#include "jbwrap.h"
#include "rlimit.h"
#include "sigmsgs.h"
@@ -87,12 +88,12 @@ extern void funcall(char **av) {
}
static void arg_count(char *name) {
- fprint(2, "too many arguments to %s\n", name);
+ fprint(2, RC "too many arguments to %s\n", name);
set(FALSE);
}
static void badnum(char *num) {
- fprint(2, "%s is a bad number\n", num);
+ fprint(2, RC "`%s' is a bad number\n", num);
set(FALSE);
}
@@ -389,18 +390,13 @@ extern void b_dot(char **av) {
return;
fd = rc_open(*av, rFrom);
if (fd < 0) {
- if (rcrc) /* on rc -l, don't flag nonexistence of .rcrc */
- rcrc = FALSE;
- else {
- uerror(*av);
- set(FALSE);
- }
+ uerror(*av);
+ set(FALSE);
return;
}
- rcrc = FALSE;
starassign(*av, av+1, TRUE);
- pushfd(fd);
interactive = i;
+ pushfd(fd);
star.name = "*";
except(eVarstack, star, &e);
doit(TRUE);