diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fbset.c | 10 | ||||
| -rw-r--r-- | util-linux/fdisk.c | 12 | ||||
| -rw-r--r-- | util-linux/script.c | 4 | ||||
| -rw-r--r-- | util-linux/volume_id/get_devname.c | 8 |
4 files changed, 26 insertions, 8 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index d616abd36..ab7770d4f 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c @@ -170,10 +170,10 @@ enum { }; #endif +#if ENABLE_FEATURE_FBSET_READMODE static int readmode(struct fb_var_screeninfo *base, const char *fn, const char *mode) { -#if ENABLE_FEATURE_FBSET_READMODE FILE *f; char buf[256]; char *p = buf; @@ -257,11 +257,9 @@ static int readmode(struct fb_var_screeninfo *base, const char *fn, return 1; } } -#else - bb_error_msg("mode reading not compiled in"); -#endif return 0; } +#endif static inline void setmode(struct fb_var_screeninfo *base, struct fb_var_screeninfo *set) @@ -389,9 +387,13 @@ int fbset_main(int argc, char **argv) fh = xopen(fbdev, O_RDONLY); xioctl(fh, FBIOGET_VSCREENINFO, &var); if (g_options & OPT_READMODE) { +#if !ENABLE_FEATURE_FBSET_READMODE + bb_show_usage(); +#else if (!readmode(&var, modefile, mode)) { bb_error_msg_and_die("unknown video mode '%s'", mode); } +#endif } setmode(&var, &varset); diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index a75b4f817..dcfae96f5 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -128,7 +128,11 @@ static unsigned read_int(unsigned low, unsigned dflt, unsigned high, unsigned ba #endif static const char *partition_type(unsigned char type); static void get_geometry(void); +#if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE static int get_boot(enum action what); +#else +static int get_boot(void); +#endif #define PLURAL 0 #define SINGULAR 1 @@ -1237,8 +1241,12 @@ get_geometry(void) * 0: found or created label * 1: I/O error */ -static int -get_boot(enum action what) +#if ENABLE_FEATURE_SUN_LABEL || ENABLE_FEATURE_FDISK_WRITABLE +static int get_boot(enum action what) +#else +static int get_boot(void) +#define get_boot(what) get_boot() +#endif { int i; diff --git a/util-linux/script.c b/util-linux/script.c index c37fd9d61..1c95ea550 100644 --- a/util-linux/script.c +++ b/util-linux/script.c @@ -29,7 +29,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv) int attr_ok; /* NB: 0: ok */ int winsz_ok; int pty; - char pty_line[32]; + char pty_line[GETPTY_BUFSIZE]; struct termios tt, rtt; struct winsize win; const char *fname = "typescript"; @@ -69,7 +69,7 @@ int script_main(int argc ATTRIBUTE_UNUSED, char **argv) shell = DEFAULT_SHELL; } - pty = getpty(pty_line, sizeof(pty_line)); + pty = getpty(pty_line); if (pty < 0) { bb_perror_msg_and_die("can't get pty"); } diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c index 75060b0d8..af03d07a3 100644 --- a/util-linux/volume_id/get_devname.c +++ b/util-linux/volume_id/get_devname.c @@ -26,6 +26,10 @@ static struct uuidCache_s { } *uuidCache; /* for now, only ext2, ext3 and xfs are supported */ +#if !ENABLE_FEATURE_VOLUMEID_ISO9660 +#define get_label_uuid(device, label, uuid, iso_only) \ + get_label_uuid(device, label, uuid) +#endif static int get_label_uuid(const char *device, char **label, char **uuid, int iso_only) { @@ -83,6 +87,10 @@ uuidcache_addentry(char * device, int major, int minor, char *label, char *uuid) memcpy(last->uuid, uuid, sizeof(last->uuid)); } +#if !ENABLE_FEATURE_VOLUMEID_ISO9660 +#define uuidcache_check_device(device_name, ma, mi, iso_only) \ + uuidcache_check_device(device_name, ma, mi) +#endif static void uuidcache_check_device(const char *device_name, int ma, int mi, int iso_only) { |