1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
|
From 95aaaa800e0dc387875b4e2adad480b72c1632ff Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Sep 2017 14:46:49 -0700
Subject: [PATCH] Rename progname as it is provided by libc
Rename local variable progname to avoid a clash with libc
global symbols
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
io/init.c | 10 +++++-----
mdrestore/xfs_mdrestore.c | 10 +++++-----
quota/init.c | 10 +++++-----
spaceman/init.c | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/io/init.c b/io/init.c
index 20d5f80..e82e101 100644
--- a/io/init.c
+++ b/io/init.c
@@ -23,7 +23,7 @@
#include "init.h"
#include "io.h"
-char *progname;
+char *io_progname;
int exitcode;
int expert;
int idlethread;
@@ -35,7 +35,7 @@ usage(void)
{
fprintf(stderr,
_("Usage: %s [-adfinrRstVx] [-m mode] [-p prog] [[-c|-C] cmd]... file\n"),
- progname);
+ io_progname);
exit(1);
}
@@ -142,7 +142,7 @@ init(
xfs_fsop_geom_t geometry = { 0 };
struct fs_path fsp;
- progname = basename(argv[0]);
+ io_progname = basename(argv[0]);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -186,7 +186,7 @@ init(
flags |= IO_NONBLOCK;
break;
case 'p':
- progname = optarg;
+ io_progname = optarg;
break;
case 'r':
flags |= IO_READONLY;
@@ -207,7 +207,7 @@ init(
expert = 1;
break;
case 'V':
- printf(_("%s version %s\n"), progname, VERSION);
+ printf(_("%s version %s\n"), io_progname, VERSION);
exit(0);
default:
usage();
diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c
index 9d1b4e8..b840a54 100644
--- a/mdrestore/xfs_mdrestore.c
+++ b/mdrestore/xfs_mdrestore.c
@@ -19,7 +19,7 @@
#include "libxfs.h"
#include "xfs_metadump.h"
-char *progname;
+char *mdrestore_progname;
int show_progress = 0;
int show_info = 0;
int progress_since_warning = 0;
@@ -30,7 +30,7 @@ fatal(const char *msg, ...)
va_list args;
va_start(args, msg);
- fprintf(stderr, "%s: ", progname);
+ fprintf(stderr, "%s: ", mdrestore_progname);
vfprintf(stderr, msg, args);
exit(1);
}
@@ -194,7 +194,7 @@ perform_restore(
static void
usage(void)
{
- fprintf(stderr, "Usage: %s [-V] [-g] source target\n", progname);
+ fprintf(stderr, "Usage: %s [-V] [-g] source target\n", mdrestore_progname);
exit(1);
}
@@ -212,7 +212,7 @@ main(
struct stat statbuf;
int is_target_file;
- progname = basename(argv[0]);
+ mdrestore_progname = basename(argv[0]);
while ((c = getopt(argc, argv, "giV")) != EOF) {
switch (c) {
@@ -223,7 +223,7 @@ main(
show_info = 1;
break;
case 'V':
- printf("%s version %s\n", progname, VERSION);
+ printf("%s version %s\n", mdrestore_progname, VERSION);
exit(0);
default:
usage();
diff --git a/quota/init.c b/quota/init.c
index d45dc4c..46403de 100644
--- a/quota/init.c
+++ b/quota/init.c
@@ -21,7 +21,7 @@
#include "input.h"
#include "init.h"
-char *progname;
+char *quota_progname;
int exitcode;
int expert;
bool foreign_allowed = false;
@@ -47,7 +47,7 @@ usage(void)
{
fprintf(stderr,
_("Usage: %s [-V] [-x] [-f] [-p prog] [-c cmd]... [-d project]... [path]\n"),
- progname);
+ quota_progname);
exit(1);
}
@@ -147,7 +147,7 @@ init(
{
int c;
- progname = basename(argv[0]);
+ quota_progname = basename(argv[0]);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -173,13 +173,13 @@ init(
projid_file = optarg;
break;
case 'p':
- progname = optarg;
+ quota_progname = optarg;
break;
case 'x':
expert++;
break;
case 'V':
- printf(_("%s version %s\n"), progname, VERSION);
+ printf(_("%s version %s\n"), quota_progname, VERSION);
exit(0);
default:
usage();
diff --git a/spaceman/init.c b/spaceman/init.c
index b3eface..bedf112 100644
--- a/spaceman/init.c
+++ b/spaceman/init.c
@@ -23,7 +23,7 @@
#include "path.h"
#include "space.h"
-char *progname;
+char *spaceman_progname;
int exitcode;
void
@@ -31,7 +31,7 @@ usage(void)
{
fprintf(stderr,
_("Usage: %s [-c cmd] file\n"),
- progname);
+ spaceman_progname);
exit(1);
}
@@ -74,7 +74,7 @@ init(
xfs_fsop_geom_t geometry = { 0 };
struct fs_path fsp;
- progname = basename(argv[0]);
+ spaceman_progname = basename(argv[0]);
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -86,7 +86,7 @@ init(
add_user_command(optarg);
break;
case 'V':
- printf(_("%s version %s\n"), progname, VERSION);
+ printf(_("%s version %s\n"), spaceman_progname, VERSION);
exit(0);
default:
usage();
--
2.14.1
|
