1 |
commit: 3142453deeeb276753f82fb958bc8311f810fdd1 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 10 18:51:07 2019 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 10 18:51:07 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3142453d |
7 |
|
8 |
qlop: use atom_format instead of custom fmt_atom |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
|
12 |
qlop.c | 63 ++++++++++++++++++++++++--------------------------------------- |
13 |
1 file changed, 24 insertions(+), 39 deletions(-) |
14 |
|
15 |
diff --git a/qlop.c b/qlop.c |
16 |
index c92575f..a60e5ac 100644 |
17 |
--- a/qlop.c |
18 |
+++ b/qlop.c |
19 |
@@ -269,25 +269,6 @@ static char *fmt_elapsedtime(struct qlop_mode *flags, time_t e) |
20 |
return _elapsed_buf; |
21 |
} |
22 |
|
23 |
-static char _atom_buf[BUFSIZ]; |
24 |
-static char *fmt_atom(struct qlop_mode *flags, depend_atom *atom) |
25 |
-{ |
26 |
- (void)flags; |
27 |
- |
28 |
- if (verbose) { |
29 |
- size_t len = snprintf(_atom_buf, sizeof(_atom_buf), "%s/%s", |
30 |
- atom->CATEGORY, atom->P); |
31 |
- if (atom->PR_int > 0) |
32 |
- snprintf(_atom_buf + len, sizeof(_atom_buf) - len, "-r%d", |
33 |
- atom->PR_int); |
34 |
- } else { |
35 |
- snprintf(_atom_buf, sizeof(_atom_buf), "%s/%s", |
36 |
- atom->CATEGORY, atom->PN); |
37 |
- } |
38 |
- |
39 |
- return _atom_buf; |
40 |
-} |
41 |
- |
42 |
/* The format of the sync log has changed over time. |
43 |
|
44 |
Old format: |
45 |
@@ -361,6 +342,10 @@ static int do_emerge_log( |
46 |
}; |
47 |
struct pkg_match *pkg; |
48 |
struct pkg_match *pkgw; |
49 |
+ const char *afmt = "%[CATEGORY]%[PN]"; |
50 |
+ |
51 |
+ if (verbose) |
52 |
+ afmt = "%[CATEGORY]%[PF]"; |
53 |
|
54 |
if ((fp = fopen(log, "r")) == NULL) { |
55 |
warnp("Could not open logfile '%s'", log); |
56 |
@@ -602,14 +587,14 @@ static int do_emerge_log( |
57 |
break; |
58 |
} |
59 |
if (flags->do_time) { |
60 |
- printf("%s >>> %s%s%s: %s\n", |
61 |
+ printf("%s >>> %s: %s\n", |
62 |
fmt_date(flags, pkgw->tbegin, tstart), |
63 |
- BLUE, fmt_atom(flags, pkgw->atom), NORM, |
64 |
+ atom_format(afmt, pkgw->atom, 0), |
65 |
fmt_elapsedtime(flags, elapsed)); |
66 |
} else if (!flags->do_average) { |
67 |
- printf("%s >>> %s%s%s\n", |
68 |
+ printf("%s >>> %s\n", |
69 |
fmt_date(flags, pkgw->tbegin, tstart), |
70 |
- BLUE, fmt_atom(flags, pkgw->atom), NORM); |
71 |
+ atom_format(afmt, pkgw->atom, 0)); |
72 |
} |
73 |
atom_implode(pkgw->atom); |
74 |
xarraydelete(merge_matches, i); |
75 |
@@ -701,14 +686,14 @@ static int do_emerge_log( |
76 |
break; |
77 |
} |
78 |
if (flags->do_time) { |
79 |
- printf("%s <<< %s%s%s: %s\n", |
80 |
+ printf("%s <<< %s: %s\n", |
81 |
fmt_date(flags, pkgw->tbegin, tstart), |
82 |
- BLUE, fmt_atom(flags, pkgw->atom), NORM, |
83 |
+ atom_format(afmt, pkgw->atom, 0), |
84 |
fmt_elapsedtime(flags, elapsed)); |
85 |
} else if (!flags->do_average) { |
86 |
- printf("%s <<< %s%s%s\n", |
87 |
+ printf("%s <<< %s\n", |
88 |
fmt_date(flags, pkgw->tbegin, tstart), |
89 |
- BLUE, fmt_atom(flags, pkgw->atom), NORM); |
90 |
+ atom_format(afmt, pkgw->atom, 0)); |
91 |
} |
92 |
atom_implode(pkgw->atom); |
93 |
xarraydelete(unmerge_matches, i); |
94 |
@@ -768,17 +753,17 @@ static int do_emerge_log( |
95 |
} |
96 |
|
97 |
if (flags->do_time) { |
98 |
- printf("%s >>> %s%s%s: %s...%s ETA: %s\n", |
99 |
+ printf("%s >>> %s: %s...%s ETA: %s\n", |
100 |
fmt_date(flags, pkgw->tbegin, 0), |
101 |
- YELLOW, fmt_atom(flags, pkgw->atom), NORM, |
102 |
+ atom_format(afmt, pkgw->atom, 0), |
103 |
fmt_elapsedtime(flags, elapsed), |
104 |
p == NULL ? "" : p, |
105 |
maxtime == 0 ? "unknown" : |
106 |
fmt_elapsedtime(flags, maxtime - elapsed)); |
107 |
} else { |
108 |
- printf("%s >>> %s%s%s...%s ETA: %s\n", |
109 |
+ printf("%s >>> %s...%s ETA: %s\n", |
110 |
fmt_date(flags, pkgw->tbegin, 0), |
111 |
- YELLOW, fmt_atom(flags, pkgw->atom), NORM, |
112 |
+ atom_format(afmt, pkgw->atom, 0), |
113 |
p == NULL ? "" : p, |
114 |
maxtime == 0 ? "unknown" : |
115 |
fmt_elapsedtime(flags, maxtime - elapsed)); |
116 |
@@ -801,16 +786,16 @@ static int do_emerge_log( |
117 |
} |
118 |
|
119 |
if (flags->do_time) { |
120 |
- printf("%s <<< %s%s%s: %s... ETA: %s\n", |
121 |
+ printf("%s <<< %s: %s... ETA: %s\n", |
122 |
fmt_date(flags, pkgw->tbegin, 0), |
123 |
- YELLOW, fmt_atom(flags, pkgw->atom), NORM, |
124 |
+ atom_format(afmt, pkgw->atom, 0), |
125 |
fmt_elapsedtime(flags, elapsed), |
126 |
maxtime == 0 ? "unknown" : |
127 |
fmt_elapsedtime(flags, maxtime - elapsed)); |
128 |
} else { |
129 |
- printf("%s <<< %s%s%s... ETA: %s\n", |
130 |
+ printf("%s <<< %s... ETA: %s\n", |
131 |
fmt_date(flags, pkgw->tbegin, 0), |
132 |
- YELLOW, fmt_atom(flags, pkgw->atom), NORM, |
133 |
+ atom_format(afmt, pkgw->atom, 0), |
134 |
maxtime == 0 ? "unknown" : |
135 |
fmt_elapsedtime(flags, maxtime - elapsed)); |
136 |
} |
137 |
@@ -821,16 +806,16 @@ static int do_emerge_log( |
138 |
time_t total_time = (time_t)0; |
139 |
|
140 |
array_for_each(merge_averages, i, pkg) { |
141 |
- printf("%s%s%s: %s average for %s%zd%s merge%s\n", |
142 |
- BLUE, fmt_atom(flags, pkg->atom), NORM, |
143 |
+ printf("%s: %s average for %s%zd%s merge%s\n", |
144 |
+ atom_format(afmt, pkg->atom, 0), |
145 |
fmt_elapsedtime(flags, pkg->time / pkg->cnt), |
146 |
GREEN, pkg->cnt, NORM, pkg->cnt == 1 ? "" : "s"); |
147 |
total_merges += pkg->cnt; |
148 |
total_time += pkg->time; |
149 |
} |
150 |
array_for_each(unmerge_averages, i, pkg) { |
151 |
- printf("%s%s%s: %s average for %s%zd%s unmerge%s\n", |
152 |
- BLUE, fmt_atom(flags, pkg->atom), NORM, |
153 |
+ printf("%s: %s average for %s%zd%s unmerge%s\n", |
154 |
+ atom_format(afmt, pkg->atom, 0), |
155 |
fmt_elapsedtime(flags, pkg->time / pkg->cnt), |
156 |
GREEN, pkg->cnt, NORM, pkg->cnt == 1 ? "" : "s"); |
157 |
total_unmerges += pkg->cnt; |