|
 |
f989b93 |
From 2d851a9726b799078f8c2279d8dd9ce39b7b4055 Mon Sep 17 00:00:00 2001
|
|
|
f989b93 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
f989b93 |
Date: Wed, 9 Jan 2013 17:27:11 +0100
|
|
|
f989b93 |
Subject: [PATCH 2/5] Recognize block limit units on setquota standard input
|
|
|
f989b93 |
MIME-Version: 1.0
|
|
|
f989b93 |
Content-Type: text/plain; charset=UTF-8
|
|
|
f989b93 |
Content-Transfer-Encoding: 8bit
|
|
|
f989b93 |
|
|
|
f989b93 |
This patch adds support for binary suffixes on `setquota -b' input.
|
|
|
f989b93 |
|
|
|
f989b93 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
f989b93 |
Signed-off-by: Jan Kara <jack@suse.cz>
|
|
|
f989b93 |
---
|
|
|
f989b93 |
setquota.c | 26 ++++++++++++++++++++++----
|
|
|
f989b93 |
1 file changed, 22 insertions(+), 4 deletions(-)
|
|
|
f989b93 |
|
|
|
f989b93 |
diff --git a/setquota.c b/setquota.c
|
|
|
f989b93 |
index ccac7f7..e55b79d 100644
|
|
|
f989b93 |
--- a/setquota.c
|
|
|
f989b93 |
+++ b/setquota.c
|
|
|
f989b93 |
@@ -319,7 +319,9 @@ static int read_entry(qid_t *id, qsize_t *isoftlimit, qsize_t *ihardlimit, qsize
|
|
|
f989b93 |
static int line = 0;
|
|
|
f989b93 |
char name[MAXNAMELEN+1];
|
|
|
f989b93 |
char linebuf[MAXLINELEN], *chptr;
|
|
|
f989b93 |
- unsigned long is, ih, bs, bh;
|
|
|
f989b93 |
+ unsigned long is, ih;
|
|
|
f989b93 |
+ char bs[MAXNAMELEN+1], bh[MAXNAMELEN+1];
|
|
|
f989b93 |
+ const char *error;
|
|
|
f989b93 |
int ret;
|
|
|
f989b93 |
|
|
|
f989b93 |
while (1) {
|
|
|
f989b93 |
@@ -337,7 +339,7 @@ static int read_entry(qid_t *id, qsize_t *isoftlimit, qsize_t *ihardlimit, qsize
|
|
|
f989b93 |
chptr++;
|
|
|
f989b93 |
if (*chptr == '\n')
|
|
|
f989b93 |
continue;
|
|
|
f989b93 |
- ret = sscanf(chptr, "%s %lu %lu %lu %lu", name, &bs, &bh, &is, &ih;;
|
|
|
f989b93 |
+ ret = sscanf(chptr, "%s %s %s %lu %lu", name, bs, bh, &is, &ih;;
|
|
|
f989b93 |
if (ret != 5) {
|
|
|
f989b93 |
errstr(_("Cannot parse input line %d.\n"), line);
|
|
|
f989b93 |
if (!(flags & FL_CONTINUE_BATCH))
|
|
|
f989b93 |
@@ -353,12 +355,28 @@ static int read_entry(qid_t *id, qsize_t *isoftlimit, qsize_t *ihardlimit, qsize
|
|
|
f989b93 |
errstr(_("Skipping line.\n"));
|
|
|
f989b93 |
continue;
|
|
|
f989b93 |
}
|
|
|
f989b93 |
+ error = str2space(bs, bsoftlimit);
|
|
|
f989b93 |
+ if (error) {
|
|
|
f989b93 |
+ errstr(_("Unable to parse block soft limit '%s' "
|
|
|
f989b93 |
+ "on line %d: %s\n"), bs, line, error);
|
|
|
f989b93 |
+ if (!(flags & FL_CONTINUE_BATCH))
|
|
|
f989b93 |
+ die(1, _("Exitting.\n"));
|
|
|
f989b93 |
+ errstr(_("Skipping line.\n"));
|
|
|
f989b93 |
+ continue;
|
|
|
f989b93 |
+ }
|
|
|
f989b93 |
+ error = str2space(bh, bhardlimit);
|
|
|
f989b93 |
+ if (error) {
|
|
|
f989b93 |
+ errstr(_("Unable to parse block hard limit '%s' "
|
|
|
f989b93 |
+ "on line %d: %s\n"), bh, line, error);
|
|
|
f989b93 |
+ if (!(flags & FL_CONTINUE_BATCH))
|
|
|
f989b93 |
+ die(1, _("Exitting.\n"));
|
|
|
f989b93 |
+ errstr(_("Skipping line.\n"));
|
|
|
f989b93 |
+ continue;
|
|
|
f989b93 |
+ }
|
|
|
f989b93 |
break;
|
|
|
f989b93 |
}
|
|
|
f989b93 |
*isoftlimit = is;
|
|
|
f989b93 |
*ihardlimit = ih;
|
|
|
f989b93 |
- *bsoftlimit = bs;
|
|
|
f989b93 |
- *bhardlimit = bh;
|
|
|
f989b93 |
return 0;
|
|
|
f989b93 |
}
|
|
|
f989b93 |
|
|
|
f989b93 |
--
|
|
|
f989b93 |
1.8.1.4
|
|
|
f989b93 |
|