emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbset: fix buglet where we were using wrong pointer

Browse Source 
readahead: stop using stdio.h
*: style fixes
This commit is contained in:
Denis Vlasenko
2007-11-06 03:05:54 +00:00
parent 1bec1b980e
commit 6bef3d1d22
14 changed files with 94 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
util-linux/dmesg.c
View File

@@ -27,7 +27,8 @@ int dmesg_main(int argc, char **argv)
len = (flags & 2) ? xatoul_range(size, 2, INT_MAX) : 16384;
buf = xmalloc(len);
if (0 > (len = klogctl(3 + (flags & 1), buf, len)))
len = klogctl(3 + (flags & 1), buf, len);
if (len < 0)
bb_perror_msg_and_die("klogctl");
// Skip <#> at the start of lines, and make sure we end with a newline.

10
util-linux/fbset.c
View File

@@ -181,10 +181,11 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
f = xfopen(fn, "r");
while (!feof(f)) {
fgets(buf, sizeof(buf), f);
if (!(p = strstr(buf, "mode ")) && !(p = strstr(buf, "mode\t")))
p = strstr(buf, "mode ");
if (!p && !(p = strstr(buf, "mode\t")))
continue;
p += 5;
if (!(p = strstr(buf, mode)))
p = strstr(p + 5, mode);
if (!p)
continue;
p += strlen(mode);
if (!isspace(*p) && (*p != 0) && (*p != '"')
@@ -193,7 +194,8 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn,
while (!feof(f)) {
fgets(buf, sizeof(buf), f);
if ((p = strstr(buf, "geometry "))) {
p = strstr(buf, "geometry ");
if (p) {
p += 9;
/* FIXME: catastrophic on arches with 64bit ints */
sscanf(p, "%d %d %d %d %d",

3
util-linux/fdisk.c
View File

@@ -1837,7 +1837,8 @@ wrong_p_order(int *prev)
last_p_start_pos = 0;
}
pe = &ptes[i];
if ((p = pe->part_table)->sys_ind) {
p = pe->part_table;
if (p->sys_ind) {
p_start_pos = get_partition_start(pe);
if (last_p_start_pos > p_start_pos) {