about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
Diffstat (limited to 'Src')
-rw-r--r--Src/builtin.c2
-rw-r--r--Src/hashtable.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index fb0d09150..ff382d889 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -2587,7 +2587,7 @@ bin_typeset(char *name, char **argv, LinkList assigns, Options ops, int func)
 	 */
 	if (*argv)
 	    joinstr = *argv;
-	else if (assigns) {
+	else if (assigns && firstnode(assigns)) {
 	    Asgment nextasg = (Asgment)firstnode(assigns);
 	    if (ASG_ARRAYP(nextasg) || ASG_VALUEP(nextasg)) {
 		zwarnnam(name, "third argument of tie must be join character");
diff --git a/Src/hashtable.c b/Src/hashtable.c
index 14c65e647..b4c83a1fa 100644
--- a/Src/hashtable.c
+++ b/Src/hashtable.c
@@ -1057,6 +1057,7 @@ static struct reswd reswds[] = {
     {{NULL, "else", 0}, ELSE},
     {{NULL, "end", 0}, ZEND},
     {{NULL, "esac", 0}, ESAC},
+    {{NULL, "export", 0}, TYPESET},
     {{NULL, "fi", 0}, FI},
     {{NULL, "for", 0}, FOR},
     {{NULL, "foreach", 0}, FOREACH},