vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* kern/emu/getroot.c (find_root_device_from_mountinfo): Use getline instead

Browse source 
of fgets into a static buffer.  Use sizeof instead of strlen on a constant
string.  Thanks to Vladimir for review.
This commit is contained in:
Colin Watson 2010-06-01 18:05:29 +01:00
parent 26c9e9bf61
commit 0d9ff59345
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.btrfs-probe
View file

@ -1,4 +1,4 @@
2010-05-18 Colin Watson <cjwatson@ubuntu.com> 2010-06-01 Colin Watson <cjwatson@ubuntu.com>
Add btrfs probing support, currently only in the single-device case. Add btrfs probing support, currently only in the single-device case.

8
kern/emu/getroot.c
View file

@ -93,14 +93,15 @@ static char *
find_root_device_from_mountinfo (const char *dir) find_root_device_from_mountinfo (const char *dir)
{ {
FILE *fp; FILE *fp;
char buf[1024]; /* XXX */ char *buf = NULL;
size_t len = 0;
char *ret = NULL; char *ret = NULL;
fp = fopen ("/proc/self/mountinfo", "r"); fp = fopen ("/proc/self/mountinfo", "r");
if (! fp) if (! fp)
return NULL; /* fall through to other methods */ return NULL; /* fall through to other methods */
while (fgets (buf, sizeof (buf), fp)) while (getline (&buf, &len, fp) > 0)
{ {
int mnt_id, parent_mnt_id; int mnt_id, parent_mnt_id;
unsigned int major, minor; unsigned int major, minor;
@ -139,7 +140,7 @@ find_root_device_from_mountinfo (const char *dir)
if (!sep) if (!sep)
continue; continue;
sep += strlen (" - "); sep += sizeof (" - ") - 1;
if (sscanf (sep, "%s %s", fstype, device) != 2) if (sscanf (sep, "%s %s", fstype, device) != 2)
continue; continue;
@ -152,6 +153,7 @@ find_root_device_from_mountinfo (const char *dir)
ret = strdup (device); ret = strdup (device);
} }
free (buf);
fclose (fp); fclose (fp);
return ret; return ret;
} }