diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
| commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
| tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch | |
| parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
| download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 | |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch')
| -rw-r--r-- | abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch b/abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch deleted file mode 100644 index bc60e43..0000000 --- a/abs/core-testing/util-linux-ng/util-linux-ng-cfdisk.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 19 Jul 2010 22:52:58 +0200 -Subject: [PATCH] cfdisk: get_string not calculating correct limits - -Reported-by: James L. Hammons <jlhamm@acm.org> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - fdisk/cfdisk.c | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c -index 7fa0b19..e7955fe 100644 ---- a/fdisk/cfdisk.c -+++ b/fdisk/cfdisk.c -@@ -421,6 +421,11 @@ fdexit(int ret) { - exit(ret); - } - -+/* -+ * Note that @len is size of @str buffer. -+ * -+ * Returns number of read bytes (without \0). -+ */ - static int - get_string(char *str, int len, char *def) { - size_t cells = 0, i = 0; -@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) { - break; - default: - #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR) -- if (i < len && iswprint(c)) { -+ if (i + 1 < len && iswprint(c)) { - wchar_t wc = (wchar_t) c; - char s[MB_CUR_MAX + 1]; - int sz = wctomb(s, wc); -@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) { - putchar(BELL); - } - #else -- if (i < len && isprint(c)) { -+ if (i + 1 < len && isprint(c)) { - mvaddch(y, x + cells, c); - if (use_def) { - clrtoeol(); -@@ -2405,7 +2410,7 @@ change_id(int i) { - - sprintf(def, "%02X", new_id); - mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: ")); -- if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT) -+ if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT) - return; - - if (len != GS_DEFAULT) { --- -1.7.2.1 - |