Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple of bugfixes in dolconf.
[doldaconnect.git]
/
clients
/
gtk2
/
dolcon.c
diff --git
a/clients/gtk2/dolcon.c
b/clients/gtk2/dolcon.c
index
b209370
..
c71b9a1
100644
(file)
--- a/
clients/gtk2/dolcon.c
+++ b/
clients/gtk2/dolcon.c
@@
-279,23
+279,16
@@
char *bytes2si(long long bytes)
{
int i;
double b;
{
int i;
double b;
- char *sd;
static char ret[64];
static char ret[64];
+ static char pfx[] = {'k', 'M', 'G', 'T'};
b = bytes;
b = bytes;
- for(i = 0; (b >= 1024) && (i <
4
); i++)
+ for(i = 0; (b >= 1024) && (i <
sizeof(pfx)
); i++)
b /= 1024;
if(i == 0)
b /= 1024;
if(i == 0)
- sd = "B";
- else if(i == 1)
- sd = "kiB";
- else if(i == 2)
- sd = "MiB";
- else if(i == 3)
- sd = "GiB";
+ snprintf(ret, 64, "%.1f B", b);
else
else
- sd = "TiB";
- snprintf(ret, 64, "%.1f %s", b, sd);
+ snprintf(ret, 64, "%.1f %ciB", b, pfx[i - 1]);
return(ret);
}
return(ret);
}
@@
-2215,18
+2208,22
@@
int main(int argc, char **argv)
textdomain(PACKAGE);
gtk_init(&argc, &argv);
connlocal = 0;
textdomain(PACKAGE);
gtk_init(&argc, &argv);
connlocal = 0;
- while((c = getopt(argc, argv, "lh")) != -1) {
+ while((c = getopt(argc, argv, "lh
V
")) != -1) {
switch(c) {
case 'l':
connlocal = 1;
break;
case 'h':
switch(c) {
case 'l':
connlocal = 1;
break;
case 'h':
- printf("usage: dolcon [-hl]\n");
+ printf("usage: dolcon [-hl
V
]\n");
printf("\t-h\tDisplay this help message\n");
printf("\t-l\tConnect to the locally running daemon\n");
printf("\t-h\tDisplay this help message\n");
printf("\t-l\tConnect to the locally running daemon\n");
+ printf("\t-V\tDisplay version info and exit\n");
+ exit(0);
+ case 'V':
+ printf("%s", RELEASEINFO);
exit(0);
default:
exit(0);
default:
- fprintf(stderr, "usage: dolcon [-hl]\n");
+ fprintf(stderr, "usage: dolcon [-hl
V
]\n");
exit(1);
}
}
exit(1);
}
}