-
OBS-URL: https://build.opensuse.org/package/show/shells/zsh?expand=0&rev=159
This commit is contained in:
parent
033e276da2
commit
3cf261b89e
@ -1,46 +0,0 @@
|
|||||||
From ac26fafa03c30e8c79e4bd70bdbb68d025643ee7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Oliver Kiddle <opk@zsh.org>
|
|
||||||
Date: Sun, 7 Jun 2015 23:07:26 +0200
|
|
||||||
Subject: [PATCH] 35412: fix for - flag when formating strings with printf
|
|
||||||
|
|
||||||
---
|
|
||||||
ChangeLog | 5 +++++
|
|
||||||
Src/builtin.c | 2 +-
|
|
||||||
Test/B03print.ztst | 8 ++++++--
|
|
||||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Src/builtin.c b/Src/builtin.c
|
|
||||||
index 643b8c6..a3d847f 100644
|
|
||||||
--- a/Src/builtin.c
|
|
||||||
+++ b/Src/builtin.c
|
|
||||||
@@ -4518,7 +4518,7 @@ bin_print(char *name, char **args, Options ops, int func)
|
|
||||||
lleft -= chars;
|
|
||||||
ptr += chars;
|
|
||||||
}
|
|
||||||
- if (width > 0 && flags[2]) width = -width;
|
|
||||||
+ if (width > 0 && flags[3]) width = -width;
|
|
||||||
if (width > 0 && lchars < width)
|
|
||||||
count += fprintf(fout, "%*c", width - lchars, ' ');
|
|
||||||
count += fwrite(b, 1, lbytes, fout);
|
|
||||||
diff --git a/Test/B03print.ztst b/Test/B03print.ztst
|
|
||||||
index 54d6350..eb79c4d 100644
|
|
||||||
--- a/Test/B03print.ztst
|
|
||||||
+++ b/Test/B03print.ztst
|
|
||||||
@@ -169,11 +169,15 @@
|
|
||||||
0:%n count zeroed on format reuse
|
|
||||||
>1
|
|
||||||
|
|
||||||
-# this may fill spec string with '%0+- #*.*lld\0' - 13 characters
|
|
||||||
- printf '%1$0+- #-08.5dx\n' 123
|
|
||||||
+# this may fill spec string with '%0'+- #*.*lld\0' - 14 characters
|
|
||||||
+ printf '%1$0'"'+- #-08.5dx\n" 123
|
|
||||||
0:maximal length format specification
|
|
||||||
>+00123 x
|
|
||||||
|
|
||||||
+ printf "x:%-20s:y\n" fubar
|
|
||||||
+0:left-justification of string
|
|
||||||
+>x:fubar :y
|
|
||||||
+
|
|
||||||
printf '%*smorning\n' -5 good
|
|
||||||
0:negative width specified
|
|
||||||
>good morning
|
|
Loading…
Reference in New Issue
Block a user