Changeset 1199 for trunk/flashrom.c

Timestamp:

Oct 7, 2010 1:48:34 AM (3 years ago)

Author:

hailfinger

Message:

flashrom -L output did not contain a list of programmers nor were all
programmers listed.
Fix it and mention at least the name of each programmer.
Wiki output is unchanged, and will need separate fixups.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/flashrom.c (modified) (1 diff)

trunk/flashrom.c

@@ -1333 +1333 @@
 }
 
+void list_programmers_linebreak(int startcol, int cols, int paren)
+{
+        const char *pname;
+        int pnamelen;
+        int remaining = 0;
+        int firstline = 1;
+        enum programmer p;
+        int i;
+
+        for (p = 0; p < PROGRAMMER_INVALID; p++) {
+                pname = programmer_table[p].name;
+                pnamelen = strlen(pname);
+                if (remaining - pnamelen - 2 < 0) {
+                        if (firstline)
+                                firstline = 0;
+                        else
+                                printf("\n");
+                        for (i = 0; i < startcol; i++)
+                                printf(" ");
+                        remaining = cols - startcol;
+                } else {
+                        printf(" ");
+                        remaining--;
+                }
+                if (paren && (p == 0)) {
+                        printf("(");
+                        remaining--;
+                }
+                printf("%s", pname);
+                remaining -= pnamelen;
+                if (p < PROGRAMMER_INVALID - 1) {
+                        printf(",");
+                        remaining--;
+                } else {
+                        if (paren)
+                                printf(")");
+                        printf("\n");
+                }
+        }
+}
+
 void print_sysinfo(void)
 {