From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VpHvf-0002qB-Ub for mharc-grub-devel@gnu.org; Sat, 07 Dec 2013 08:28:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpHvV-0002pJ-PU for grub-devel@gnu.org; Sat, 07 Dec 2013 08:28:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpHvN-0004Eg-Cx for grub-devel@gnu.org; Sat, 07 Dec 2013 08:28:09 -0500 Received: from mail-la0-x236.google.com ([2a00:1450:4010:c03::236]:49401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpHvN-0004EX-51 for grub-devel@gnu.org; Sat, 07 Dec 2013 08:28:01 -0500 Received: by mail-la0-f54.google.com with SMTP id b8so714012lan.13 for ; Sat, 07 Dec 2013 05:28:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=a4EH+ZlXXp+JwQU2x795ZDmbNXXhzHDInmLQvVf6bxo=; b=LESaOESQzxGHARDRyiTk0azJi2rTobsSpWW3Kn5dMvXFnaeyEU0IWCjlSqa72B7eXr J+nY4qJIhFQz972QbLzGq4EwVlKPV8zSajb+OfJtRjiQuD4jLPPCycjyKRHhXTdR8pdq kuk+xhF97WkCw/K66d1QYlte4b4Kr8eB8Qtf20YppYc+GI6R5hPavFp8AJuHonPYiXMR rilxos/eGyH0FXOeDxsvvKHze1sfncWwx6PBOlDjMSvyv786yHV5NFg7c1F1LSsfKpLt Lwk5FslXJocTRPmINjDmewGyAJVACob+Fm+EU9BG51ItpzZYyQmqm385SRwkEIcycxbF Bc1g== X-Received: by 10.112.150.164 with SMTP id uj4mr2097115lbb.46.1386422880088; Sat, 07 Dec 2013 05:28:00 -0800 (PST) Received: from localhost.localdomain (ppp91-76-134-134.pppoe.mtu-net.ru. [91.76.134.134]) by mx.google.com with ESMTPSA id xl4sm2907228lac.9.2013.12.07.05.27.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Dec 2013 05:27:59 -0800 (PST) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] sort target list in grub-mkimage help output to make it easier to read Date: Sat, 7 Dec 2013 17:27:53 +0400 Message-Id: <1386422873-20547-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::236 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 13:28:18 -0000 --- util/mkimage.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/util/mkimage.c b/util/mkimage.c index ad12f8a..94f7edb 100644 --- a/util/mkimage.c +++ b/util/mkimage.c @@ -959,21 +959,27 @@ grub_util_get_target_name (const struct grub_install_image_target_desc *t) char * grub_install_get_image_targets_string (void) { + const char **arr = xmalloc (sizeof (char *) * ARRAY_SIZE (image_targets)); int format_len = 0; char *formats; char *ptr; unsigned i; for (i = 0; i < ARRAY_SIZE (image_targets); i++) - format_len += strlen (image_targets[i].names[0]) + 2; + { + arr[i] = image_targets[i].names[0]; + format_len += strlen (image_targets[i].names[0]) + 2; + } ptr = formats = xmalloc (format_len); + qsort (arr, ARRAY_SIZE (image_targets), sizeof (char *), grub_qsort_strcmp); for (i = 0; i < ARRAY_SIZE (image_targets); i++) { - strcpy (ptr, image_targets[i].names[0]); - ptr += strlen (image_targets[i].names[0]); + strcpy (ptr, arr[i]); + ptr += strlen (arr[i]); *ptr++ = ','; *ptr++ = ' '; } ptr[-2] = 0; + free (arr); return formats; } -- tg: (f585c90..) u/grub-mkimage-sort-targets (depends on: master)