Merge branch 'master' into feature/stringfix

1 files changed, 9 insertions, 6 deletions

diff --git a/builtin.c b/builtin.c
index a6082ee0..4d816687 100644
--- a/builtin.c
+++ b/builtin.c
@@ -4001,7 +4001,7 @@ NODE *
 do_typeof(int nargs)
 {
 	NODE *arg;
-	char *res = "unknown";
+	char *res = NULL;
 	bool deref = true;
 
 	arg = POP();
@@ -4013,9 +4013,6 @@ do_typeof(int nargs)
 		break;
 	case Node_val:
 		switch (fixtype(arg)->flags & (STRING|NUMBER|USER_INPUT|REGEX)) {
-		case STRING:
-			res = "string";
-			break;
 		case NUMBER:
 			res = "number";
 			break;
@@ -4025,14 +4022,20 @@ do_typeof(int nargs)
 		case REGEX:
 			res = "regexp";
 			break;
+		case STRING:
+			res = "string";
+			// fall through
 		case NUMBER|STRING:
-			if (arg == Nnull_string) {
+			if (arg == Nnull_string || (arg->flags & NULL_FIELD) != 0) {
 				res = "unassigned";
 				break;
 			}
 			/* fall through */
 		default:
-			warning(_("typeof detected invalid flags combination `%s'; please file a bug report."), flags2str(arg->flags));
+			if (res == NULL) {
+				warning(_("typeof detected invalid flags combination `%s'; please file a bug report."), flags2str(arg->flags));
+				res = "unknown";
+			}
 			break;
 		}
 		break;