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
lib/support: clean up definition of flags_array
[tools/e2fsprogs.git]
/
misc
/
blkid.c
diff --git
a/misc/blkid.c
b/misc/blkid.c
index
2e48caa
..
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);
+ }
}
}
}
}
@@
-100,19
+102,27
@@
static int get_terminal_width(void)
struct winsize w_win;
#endif
const char *cp;
struct winsize w_win;
#endif
const char *cp;
+ int width = 80;
#ifdef TIOCGSIZE
#ifdef TIOCGSIZE
- if (ioctl (0, TIOCGSIZE, &t_win) == 0)
- return (t_win.ts_cols);
+ if (ioctl (0, TIOCGSIZE, &t_win) == 0) {
+ width = t_win.ts_cols;
+ goto got_it;
+ }
#endif
#ifdef TIOCGWINSZ
#endif
#ifdef TIOCGWINSZ
- if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
- return (w_win.ws_col);
+ if (ioctl (0, TIOCGWINSZ, &w_win) == 0) {
+ width = w_win.ws_col;
+ goto got_it;
+ }
#endif
cp = getenv("COLUMNS");
if (cp)
#endif
cp = getenv("COLUMNS");
if (cp)
- return strtol(cp, NULL, 10);
- return 80;
+ width = atoi(cp);
+got_it:
+ if (width > 4096)
+ return 4096; /* sanity check */
+ return width;
}
static int pretty_print_word(const char *str, int max_len,
}
static int pretty_print_word(const char *str, int max_len,
@@
-142,20
+152,21
@@
static void pretty_print_line(const char *device, const char *fs_type,
static int term_width = -1;
int len, w;
static int term_width = -1;
int len, w;
- if (term_width < 0)
+ if (term_width < 0)
{
term_width = get_terminal_width();
term_width = get_terminal_width();
- if (term_width > 80) {
- term_width -= 80;
- w = term_width / 10;
- if (w > 8)
- w = 8;
- term_width -= 2*w;
- label_len += w;
- fs_type_len += w;
- w = term_width/2;
- device_len += w;
- mtpt_len +=w;
+ if (term_width > 80) {
+ term_width -= 80;
+ w = term_width / 10;
+ if (w > 8)
+ w = 8;
+ term_width -= 2*w;
+ label_len += w;
+ fs_type_len += w;
+ w = term_width/2;
+ device_len += w;
+ mtpt_len +=w;
+ }
}
len = pretty_print_word(device, device_len, 0, 1);
}
len = pretty_print_word(device, device_len, 0, 1);
@@
-284,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;
@@
-340,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;