-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 2/28/2014 6:00 AM, Maciej Małecki wrote:
>>> libfdisk/src/context.c | 17 +++++++++++++---- 1 file changed,
>>> 13 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
>>> index c405403..40f9080 100644 --- a/libfdisk/src/context.c +++
>>> b/libfdisk/src/context.c @@ -248,17 +248,26 @@ static int
>>> warn_wipe(struct fdisk_context *cxt) int
>>> fdisk_context_assign_device(struct fdisk_context *cxt, const
>>> char *fname, int readonly) { - int fd; + int fd, mode;
>>>
>>> DBG(CONTEXT, dbgprint("assigning device %s", fname));
>>> assert(cxt);
>>>
>>> reset_context(cxt);
>>>
>>> - if (readonly == 1 || (fd = open(fname, O_RDWR|O_CLOEXEC))
>>> < 0) { - if ((fd = open(fname, O_RDONLY|O_CLOEXEC))
>>> < 0) +retry: + mode = (readonly ? O_RDONLY : O_RDWR) |
>>> O_CLOEXEC; + fd = open(fname, mode); + if (fd < 0) { +
>>> if (readonly) return -errno; - readonly = 1; +
>>> else { + fdisk_warn(cxt, +
>>> _("%s: opening device in read write mode failed"), +
>>> fname); + readonly = 1; +
>>> goto retry; + } }
>>
>> This is 1) obscenely ugly and 2) not the place for such message.
>> There's no reason to pollute output like this. Why do I care how
>> the device is opened when I'm not going to write anything to it?
>>
>> The correct way is to do what you do in patch 2, inform the user
>> that the device is only for opened for reading and just skip the
>> write operation.
You really want to tell the user that they aren't going to be able to
write up front.
I have to say this function was already broken. If the caller
requests write access and that fails, then the call should fail. It
should *not* automatically fall back to read-only without giving any
indication to the caller. If the caller wants to retry for read only,
then it can, and print a warning letting the user know it has switched
to ready only.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJTELgMAAoJEI5FoCIzSKrwlM0H/iVJLdAPqE3OOgaIJRmk+NC5
uLlMwVMY4zHJakuq4GtxX5rekdy+kLTuVokZjxUTcI2WM9uBJwFXSwd4sPJ2i3C+
47w8tS4FMzP4LKOck60cc61FpAaKaqez9GGQ8zkMNZnt5S6ptCOOoMGtYuqXm1AW
LWYHSbSsmXsTiQIWLEg/GZhBMUaInjcMiVr4nzINXN8CnwJ695Xyold0rnkAHxK0
+FhKNtGuab88GjGosla9kK1Nd2/6rjLt6HqYDBHfZaWkcTzjv4y+OCEz6Am7SFZp
PkrqmWV0FXvUGj8C4RrNf3dSiElorgkPbTS1P1+JRNFLZIAO7YFbapke7MZ4eDg=
=7pzO
-----END PGP SIGNATURE-----
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
