Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-02-24 08:54:44 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

support k, m, g for -s, -S, and -b options (Issue #20)

Browse Source
This commit is contained in:
Ryo Nakamura
2024-04-26 17:54:58 +09:00
parent dd99bc0ac9
commit 61199acc7b
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/main.c
View File

@@ -260,6 +260,37 @@ void print_cli(const char *fmt, ...)
void print_stat(bool final); void print_stat(bool final);
long atol_with_unit(char *value, bool i)
{
/* value must be "\d+[kKmMgG]?" */
char *u = value + (strlen(optarg) - 1);
long k = i ? 1024 : 1000;
long factor = 1;
long v;
switch (*u) {
case 'k':
case 'K':
factor = k;
*u = '\0';
break;
case 'm':
case 'M':
factor = k * k;
*u = '\0';
break;
case 'g':
case 'G':
factor = k * k * k;
*u = '\0';
break;
}
v = atol(value);
return v * factor;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct mscp_ssh_opts s; struct mscp_ssh_opts s;
@@ -271,8 +302,6 @@ int main(int argc, char **argv)
char *remote = NULL, *checkpoint_save = NULL, *checkpoint_load = NULL; char *remote = NULL, *checkpoint_save = NULL, *checkpoint_load = NULL;
bool dryrun = false, resume = false; bool dryrun = false, resume = false;
int nr_options = 0; int nr_options = 0;
size_t factor = 1;
char *unit;
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
memset(&o, 0, sizeof(o)); memset(&o, 0, sizeof(o));
@@ -305,36 +334,19 @@ int main(int argc, char **argv)
resume = true; resume = true;
break; break;
case 's': case 's':
o.min_chunk_sz = atoi(optarg); o.min_chunk_sz = atol_with_unit(optarg, true);
break; break;
case 'S': case 'S':
o.max_chunk_sz = atoi(optarg); o.max_chunk_sz = atol_with_unit(optarg, true);
break; break;
case 'a': case 'a':
o.nr_ahead = atoi(optarg); o.nr_ahead = atoi(optarg);
break; break;
case 'b': case 'b':
o.buf_sz = atoi(optarg); o.buf_sz = atol_with_unit(optarg, true);
break; break;
case 'L': case 'L':
factor = 1; o.bitrate = atol_with_unit(optarg, false);
unit = optarg + (strlen(optarg) - 1);
if (*unit == 'k' || *unit == 'K') {
factor = 1000;
*unit = '\0';
} else if (*unit == 'm' || *unit == 'M') {
factor = 1000000;
*unit = '\0';
} else if (*unit == 'g' || *unit == 'G') {
factor = 1000000000;
*unit = '\0';
}
o.bitrate = atol(optarg);
if (o.bitrate == 0) {
pr_err("invalid bitrate: %s", optarg);
return 1;
}
o.bitrate *= factor;
break; break;
case '4': case '4':
s.ai_family = AF_INET; s.ai_family = AF_INET;