Vladimir 'φ-coder/phcoder' Serbinenko, le Wed 25 Apr 2012 10:36:59 +0200, a
écrit :
> On 25.04.2012 02:27, Samuel Thibault wrote:
> > Vladimir 'φ-coder/phcoder' Serbinenko, le Wed 25 Apr 2012 01:57:54 +0200, a
> > écrit :
> >> On 25.04.2012 01:52, Samuel Thibault wrote:
> >>> + grub_util_error (_("Could not open path `%s'"), path);
> >> This one should be unified with other similar messages.
> > Err, in the file I can see various ways: "Unable to", "cannot", "failed
> > to", "couldn't", "can't". Which one should be used.
> Where?
The util/getroot.c file, the various error conditions.
> For open we always use: msgid "cannot open `%s': %s"
So be it, here is an updated patch.
Samuel
=== modified file 'util/getroot.c'
--- util/getroot.c 2012-04-22 19:02:55 +0000
+++ util/getroot.c 2012-04-25 11:36:04 +0000
@@ -700,6 +700,69 @@
#elif defined (__GNU__)
+static char *
+find_hurd_root_device (const char *path)
+{
+ file_t file;
+ error_t err;
+ char *argz = NULL, *name = NULL, *ret;
+ size_t argz_len = 0;
+ int i;
+
+ file = file_name_lookup (path, 0, 0);
+ if (file == MACH_PORT_NULL)
+ grub_util_error (_("cannot open `%s': %s"), path, strerror (errno));
+
+ /* This returns catenated 0-terminated strings. */
+ err = file_get_fs_options (file, &argz, &argz_len);
+ if (err)
+ grub_util_error (_("cannot get filesystem options "
+ "for path `%s': %s"), path, strerror(err));
+
+ /* Make sure the string is terminated. */
+ argz[argz_len-1] = 0;
+
+ /* Skip first word (translator path) and options. */
+ for (i = strlen (&argz[0]) + 1; i < argz_len; i += strlen (&argz[i]) + 1)
+ {
+ if (argz[i] != '-')
+ {
+ /* Non-option. Only accept one, assumed to be the FS path. */
+ /* XXX: this should be replaced by an RPC to the translator. */
+ if (name)
+ /* TRANSLATORS: we expect to get something like
+ /hurd/foobar --option1 --option2=baz /dev/something
+ */
+ grub_util_error (_("Translator `%s' for path `%s' has several "
+ "non-option words, at least `%s' and `%s'"),
+ &argz[0], path, name, &argz[i]);
+ name = &argz[i];
+ }
+ }
+
+ if (!name)
+ /* TRANSLATORS: we expect to get something like
+ /hurd/foobar --option1 --option2=baz /dev/something
+ */
+ grub_util_error (_("Translator `%s' for path `%s' is given only options, "
+ "cannot find device part"), &argz[0], path);
+
+ if (!strncmp (name, "device:", strlen ("device:")))
+ {
+ char *dev_name = name + strlen ("device:");
+ size_t size = strlen ("/dev/") + strlen (dev_name) + 1;
+ ret = malloc (size);
+ snprintf (ret, size, "/dev/%s", dev_name);
+ }
+ else if (!strncmp (name, "file:", strlen ("file:")))
+ ret = strdup (name + strlen ("file:"));
+ else
+ ret = strdup (name);
+
+ munmap (argz, argz_len);
+ return ret;
+}
+
#elif ! defined(__CYGWIN__)
char *
@@ -930,65 +993,7 @@
grub_guess_root_devices (const char *dir)
{
char **os_dev = NULL;
-#ifdef __GNU__
- file_t file;
- mach_port_t *ports;
- int *ints;
- loff_t *offsets;
- char *data;
- error_t err;
- mach_msg_type_number_t num_ports = 0, num_ints = 0, num_offsets = 0,
data_len = 0;
- size_t name_len;
-
- file = file_name_lookup (dir, 0, 0);
- if (file == MACH_PORT_NULL)
- return 0;
-
- err = file_get_storage_info (file,
- &ports, &num_ports,
- &ints, &num_ints,
- &offsets, &num_offsets,
- &data, &data_len);
-
- if (num_ints < 1)
- grub_util_error (_("Storage info for `%s' does not include type"), dir);
- if (ints[0] != STORAGE_DEVICE)
- grub_util_error (_("Filesystem of `%s' is not stored on local disk"), dir);
-
- if (num_ints < 5)
- grub_util_error (_("Storage info for `%s' does not include name"), dir);
- name_len = ints[4];
- if (name_len < data_len)
- grub_util_error (_("Bogus name length for storage info for `%s'"), dir);
- if (data[name_len - 1] != '\0')
- grub_util_error (_("Storage name for `%s' not NUL-terminated"), dir);
-
- os_dev = xmalloc (2 * sizeof (os_dev[0]));
- os_dev[0] = xmalloc (sizeof ("/dev/") - 1 + data_len);
- memcpy (os_dev[0], "/dev/", sizeof ("/dev/") - 1);
- memcpy (os_dev[0] + sizeof ("/dev/") - 1, data, data_len);
- os_dev[1] = 0;
-
- if (ports && num_ports > 0)
- {
- mach_msg_type_number_t i;
- for (i = 0; i < num_ports; i++)
- {
- mach_port_t port = ports[i];
- if (port != MACH_PORT_NULL)
- mach_port_deallocate (mach_task_self(), port);
- }
- munmap ((caddr_t) ports, num_ports * sizeof (*ports));
- }
-
- if (ints && num_ints > 0)
- munmap ((caddr_t) ints, num_ints * sizeof (*ints));
- if (offsets && num_offsets > 0)
- munmap ((caddr_t) offsets, num_offsets * sizeof (*offsets));
- if (data && data_len > 0)
- munmap (data, data_len);
- mach_port_deallocate (mach_task_self (), file);
-#else /* !__GNU__ */
+#ifndef __GNU__
struct stat st;
dev_t dev;
@@ -1035,6 +1040,7 @@
grub_util_error (_("cannot stat `%s': %s"), dir, strerror (errno));
dev = st.st_dev;
+#endif /* !__GNU__ */
os_dev = xmalloc (2 * sizeof (os_dev[0]));
@@ -1042,6 +1048,10 @@
/* Cygwin specific function. */
os_dev[0] = grub_find_device (dir, dev);
+#elif defined __GNU__
+ /* GNU/Hurd specific function. */
+ os_dev[0] = find_hurd_root_device (dir);
+
#else
/* This might be truly slow, but is there any better way? */
@@ -1054,7 +1064,6 @@
}
os_dev[1] = 0;
-#endif /* !__GNU__ */
return os_dev;
}
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
