strace.c: sort option arguments alphabetically

Except for the ones that enabled by configure options.

While we are here, let's also change the indentation of while expression
continuation in order to separate it from the following switch clause.

* strace.c (init): Reorder options in getopt() call.

diff --git a/strace.c b/strace.c
index d15bef22e6eae8df90e9f6258718e5270af8f9db..6fbea45f1b6bf4aa3100733640b3138f5471a3b8 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -1577,13 +1577,11 @@ init(int argc, char *argv[])
 # error Bug in DEFAULT_QUAL_FLAGS
 #endif
        qualify("signal=all");
-       while ((c = getopt(argc, argv,
-               "+b:cCdfFhiqrtTvVwxyz"
+       while ((c = getopt(argc, argv, "+"
 #ifdef USE_LIBUNWIND
-               "k"
+           "k"
 #endif
-               "D"
-               "a:e:o:O:p:s:S:u:E:P:I:")) != EOF) {
+           "a:b:cCdDe:E:fFhiI:o:O:p:P:qrs:S:tTu:vVwxyz")) != EOF) {
                switch (c) {
                case 'b':
                        if (strcmp(optarg, "execve") != 0)