Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/freebsd/poudriere.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bryan@shatow.net>2017-03-10 21:31:43 +0300
committerBryan Drewery <bryan@shatow.net>2017-03-10 21:32:05 +0300
commit40cab3829b5e4f17b7f43da598bc9224dd7bed84 (patch)
treefa41dc6319d780a7130769e9adae7b6ad7c5a163 /external
parent1404ede2f44429a771f981b405f12a980e30997f (diff)
Upate sh to FreeBSD head r315005
Diffstat (limited to 'external')
-rw-r--r--external/sh/expand.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/external/sh/expand.c b/external/sh/expand.c
index 816f62e0..78a34d2d 100644
--- a/external/sh/expand.c
+++ b/external/sh/expand.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/bin/sh/expand.c 314686 2017-03-04 22:58:34Z jilles $");
+__FBSDID("$FreeBSD: head/bin/sh/expand.c 315005 2017-03-10 16:04:00Z jilles $");
#include <sys/types.h>
#include <sys/time.h>
@@ -769,8 +769,10 @@ again: /* jump here after setting a variable with ${var=text} */
case VSTRIMLEFTMAX:
case VSTRIMRIGHT:
case VSTRIMRIGHTMAX:
- if (!set)
+ if (!set) {
+ set = 1;
break;
+ }
/*
* Terminate the string and start recording the pattern
* right after it