Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e2fsck: merge dir_info after thread finishes
[tools/e2fsprogs.git]
/
misc
/
blkid.c
diff --git
a/misc/blkid.c
b/misc/blkid.c
index
55808af
..
472f017
100644
(file)
--- a/
misc/blkid.c
+++ b/
misc/blkid.c
@@
-87,7
+87,9
@@
static void safe_print(const char *cp, int len)
fputc('^', stdout);
ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */
}
fputc('^', stdout);
ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */
}
- fputc(ch, stdout);
+ if (ch != '"') {
+ fputc(ch, stdout);
+ }
}
}
}
}
@@
-293,10
+295,7
@@
int main(int argc, char **argv)
while ((c = getopt (argc, argv, "c:f:ghlLo:s:t:w:v")) != EOF)
switch (c) {
case 'c':
while ((c = getopt (argc, argv, "c:f:ghlLo:s:t:w:v")) != EOF)
switch (c) {
case 'c':
- if (optarg && !*optarg)
- read = NULL;
- else
- read = optarg;
+ read = optarg;
if (!write)
write = read;
break;
if (!write)
write = read;
break;
@@
-349,10
+348,7
@@
int main(int argc, char **argv)
version = 1;
break;
case 'w':
version = 1;
break;
case 'w':
- if (optarg && !*optarg)
- write = NULL;
- else
- write = optarg;
+ write = optarg;
break;
case 'h':
err = 0;
break;
case 'h':
err = 0;