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

just whitespace

Browse Source
This commit is contained in:
Tim Riker
2006-01-25 00:08:53 +00:00
parent f64ff682a3
commit c1ef7bdd8d
254 changed files with 2002 additions and 2002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
miscutils/Config.in
View File

@ -218,14 +218,14 @@ config CONFIG_MAKEDEVS
.
There are two choices for command line behaviour, the interface
as used by LEAF/Linux Router Project, or a device table file.
.
.
'leaf' is traditionally what busybox follows, it allows multiple
devices of a particluar type to be created per command.
e.g. /dev/hda[0-9]
Device properties are passed as command line arguments.
.
'table' reads device properties from a file or stdin, allowing
a batch of unrelated devices to be makde with one command.
a batch of unrelated devices to be makde with one command.
User/group names are allowed as an alternative to uid/gid.
choice

88
miscutils/devfsd.c
View File

@ -121,7 +121,7 @@ struct devfsd_notify_struct
#define BUFFER_SIZE 16384
#define DEVFSD_VERSION "1.3.25"
#define CONFIG_FILE "/etc/devfsd.conf"
#define MODPROBE "/sbin/modprobe"
#define MODPROBE "/sbin/modprobe"
#define MODPROBE_SWITCH_1 "-k"
#define MODPROBE_SWITCH_2 "-C"
#define CONFIG_MODULES_DEVFS "/etc/modules.devfs"
@ -289,7 +289,7 @@ static struct event_type
/* Busybox messages */
static const char * const bb_msg_proto_rev = "protocol revision";
static const char * const bb_msg_bad_config = "bad %s config file: %s";
static const char * const bb_msg_bad_config = "bad %s config file: %s";
static const char * const bb_msg_small_buffer = "buffer too small";
static const char * const bb_msg_variable_not_found = "variable: %s not found";
@ -297,16 +297,16 @@ static const char * const bb_msg_variable_not_found = "variable: %s not found";
static void msg_logger(int pri, const char * fmt, ... )
{
va_list ap;
int ret;
int ret;
va_start(ap, fmt);
ret = access ("/dev/log", F_OK);
ret = access ("/dev/log", F_OK);
if (ret == 0) {
openlog(bb_applet_name, 0, LOG_DAEMON);
vsyslog( pri , fmt, ap);
/* Man: A trailing newline is added when needed. */
closelog();
}
}
/* ENABLE_DEVFSD_VERBOSE is always enabled if msg_logger is used */
if ((ENABLE_DEVFSD_VERBOSE && ret) || ENABLE_DEBUG) {
bb_error_msg(fmt, ap);
@ -319,28 +319,28 @@ static void msg_logger_and_die(int pri, const char* fmt, ...)
va_list ap;
va_start(ap, fmt);
msg_logger(pri, fmt, ap);
msg_logger(pri, fmt, ap);
va_end(ap);
exit(EXIT_FAILURE);
}
/* Busybox stuff */
#if defined(CONFIG_DEVFSD_VERBOSE) || defined(CONFIG_DEBUG)
#define devfsd_error_msg(fmt, args...) bb_error_msg(fmt, ## args)
#define devfsd_perror_msg_and_die(fmt, args...) bb_perror_msg_and_die(fmt, ## args)
#define devfsd_error_msg_and_die(fmt, args...) bb_error_msg_and_die(fmt, ## args)
#define devfsd_error_msg(fmt, args...) bb_error_msg(fmt, ## args)
#define devfsd_perror_msg_and_die(fmt, args...) bb_perror_msg_and_die(fmt, ## args)
#define devfsd_error_msg_and_die(fmt, args...) bb_error_msg_and_die(fmt, ## args)
#if defined(CONFIG_DEBUG)
#define debug_msg_logger(x, fmt, args...) msg_logger(x, fmt, ## args)
#else
#define debug_msg_logger(x, fmt, args...)
#define debug_msg_logger(x, fmt, args...)
#endif
#else
#define debug_msg_logger(x, fmt, args...)
#define msg_logger(p, fmt, args...)
#define msg_logger(p, fmt, args...)
#define msg_logger_and_die(p, fmt, args...) exit(1)
#define devfsd_perror_msg_and_die(fmt, args...) exit(1)
#define devfsd_error_msg_and_die(fmt, args...) exit(1)
#define devfsd_error_msg(fmt, args...)
#define devfsd_error_msg(fmt, args...)
#endif
static void do_ioctl_and_die(int fd, int request, unsigned long event_mask_flag)
@ -451,10 +451,10 @@ int devfsd_main (int argc, char **argv)
{
if(argv[count][1]=='v' && !argv[count][2]) /* -v */
print_version = TRUE;
else if(ENABLE_DEVFSD_FG_NP && argv[count][1]=='f'
else if(ENABLE_DEVFSD_FG_NP && argv[count][1]=='f'
&& argv[count][2]=='g' && !argv[count][3]) /* -fg */
do_daemon = FALSE;
else if(ENABLE_DEVFSD_FG_NP && argv[count][1]=='n'
else if(ENABLE_DEVFSD_FG_NP && argv[count][1]=='n'
&& argv[count][2]=='p' && !argv[count][3]) /* -np */
no_polling = TRUE;
else
@ -470,7 +470,7 @@ int devfsd_main (int argc, char **argv)
if (chdir (mount_point) != 0)
devfsd_perror_msg_and_die(mount_point);
fd = bb_xopen (".devfsd", O_RDONLY);
if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0)
@ -503,15 +503,15 @@ int devfsd_main (int argc, char **argv)
new_action.sa_handler = signal_handler;
if (sigaction (SIGHUP, &new_action, NULL) != 0 || sigaction (SIGUSR1, &new_action, NULL) != 0 )
devfsd_error_msg_and_die( "sigaction");
bb_printf("%s v%s started for %s\n",bb_applet_name, DEVFSD_VERSION, mount_point);
/* Set umask so that mknod(2), open(2) and mkdir(2) have complete control over permissions */
/* Set umask so that mknod(2), open(2) and mkdir(2) have complete control over permissions */
umask (0);
read_config_file (CONFIG_FILE, FALSE, &event_mask);
/* Do the scan before forking, so that boot scripts see the finished product */
dir_operation(SERVICE,mount_point,0,NULL);
if (ENABLE_DEVFSD_FG_NP && no_polling)
exit (0);
if (do_daemon)
@ -553,7 +553,7 @@ static void read_config_file (char *path, int optional, unsigned long *event_mas
char *line=NULL;
debug_msg_logger(LOG_INFO, "%s: %s", __FUNCTION__, path);
if (stat (path, &statbuf) == 0 )
{
/* Don't read 0 length files: ignored */
@ -564,7 +564,7 @@ static void read_config_file (char *path, int optional, unsigned long *event_mas
/* strip last / from dirname so we don't need to check for it later */
while( path && path[1]!='\0' && path[strlen(path)-1] == '/')
path[strlen(path) -1] = '\0';
dir_operation(READ_CONFIG, path, 0, event_mask);
return;
}
@ -586,7 +586,7 @@ static void read_config_file (char *path, int optional, unsigned long *event_mas
} else {
read_config_file_err:
if(optional == 0 && errno == ENOENT)
msg_logger_and_die(LOG_ERR, "read config file: %s: %m", path);
msg_logger_and_die(LOG_ERR, "read config file: %s: %m", path);
}
return;
} /* End Function read_config_file */
@ -691,7 +691,7 @@ static void process_config_line (const char *line, unsigned long *event_mask)
the device name) to the module loading facility. In addition,
the /etc/modules.devfs configuration file is used.*/
if (ENABLE_DEVFSD_MODLOAD)
new->action.what = AC_MODLOAD;
new->action.what = AC_MODLOAD;
break;
case 6: /* EXECUTE */
new->action.what = AC_EXECUTE;
@ -759,7 +759,7 @@ static int do_servicing (int fd, unsigned long event_mask)
unsigned long tmp_event_mask;
debug_msg_logger(LOG_INFO, __FUNCTION__);
/* Tell devfs what events we care about */
tmp_event_mask = event_mask;
do_ioctl_and_die(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
@ -816,9 +816,9 @@ static void service_name (const struct devfsd_notify_struct *info)
continue;
for (n = 0; (n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n)
/* VOID */;
debug_msg_logger(LOG_INFO, "%s: action.what %d", __FUNCTION__, entry->action.what);
switch (entry->action.what)
{
case AC_PERMISSIONS:
@ -928,7 +928,7 @@ static void action_execute (const struct devfsd_notify_struct *info,
static void action_copy (const struct devfsd_notify_struct *info,
const struct config_entry_struct *entry,
const regmatch_t *regexpr, unsigned int numexpr)
const regmatch_t *regexpr, unsigned int numexpr)
/* [SUMMARY] Copy permissions.
<info> The devfs change.
<entry> The config file entry.
@ -945,9 +945,9 @@ static void action_copy (const struct devfsd_notify_struct *info,
int ret = 0;
debug_msg_logger(LOG_INFO, __FUNCTION__);
dest_stat.st_mode = 0;
if ( (info->type == DEVFSD_NOTIFY_CHANGE) && S_ISLNK (info->mode) )
return;
gv_info.info = info;
@ -970,7 +970,7 @@ static void action_copy (const struct devfsd_notify_struct *info,
new_mode |= S_ISVTX;
else if ( (info->type == DEVFSD_NOTIFY_CHANGE) && (dest_stat.st_mode & S_ISVTX) )
new_mode |= S_ISVTX;
ret = copy_inode (destination, &dest_stat, new_mode, source, &source_stat);
ret = copy_inode (destination, &dest_stat, new_mode, source, &source_stat);
if (ENABLE_DEBUG && ret && (errno != EEXIST))
debug_msg_logger(LOG_ERR, "copy_inode: %s to %s: %m", source, destination);
return;
@ -1126,7 +1126,7 @@ static int copy_inode (const char *destpath, const struct stat *dest_stat,
( dest_len = readlink (destpath , dest_link , STRING_LENGTH - 1) ) < 0 )
return (FALSE);
source_link[source_len] = '\0';
dest_link[dest_len] = '\0';
dest_link[dest_len] = '\0';
if ( (source_len != dest_len) || (strcmp (source_link, dest_link) != 0) )
{
unlink (destpath);
@ -1224,12 +1224,12 @@ static int get_uid_gid (int flag, const char *string)
struct passwd *pw_ent;
struct group *grp_ent;
static char *msg;
if (ENABLE_DEVFSD_VERBOSE)
msg="user";
debug_msg_logger(LOG_INFO, __FUNCTION__);
if(ENABLE_DEBUG && flag != UID && flag != GID)
msg_logger_and_die(LOG_ERR,"%s: flag != UID && flag != GID", __FUNCTION__);
@ -1241,7 +1241,7 @@ static int get_uid_gid (int flag, const char *string)
if ( flag == GID && ( grp_ent = getgrnam (string) ) != NULL )
return (grp_ent->gr_gid);
else if(ENABLE_DEVFSD_VERBOSE)
else if(ENABLE_DEVFSD_VERBOSE)
msg="group";
if(ENABLE_DEVFSD_VERBOSE)
@ -1264,7 +1264,7 @@ static mode_t get_mode (const char *string)
return strtoul (string, NULL, 8);
if (strlen (string) != 9)
msg_logger_and_die(LOG_ERR, "bad mode: %s", string);
mode = 0;
i= S_IRUSR;
while(i>0)
@ -1280,7 +1280,7 @@ static mode_t get_mode (const char *string)
static void signal_handler (int sig)
{
debug_msg_logger(LOG_INFO, __FUNCTION__);
caught_signal = TRUE;
if (sig == SIGHUP)
caught_sighup = TRUE;
@ -1301,7 +1301,7 @@ static const char *get_variable (const char *variable, void *info)
if (gethostname (hostname, STRING_LENGTH - 1) != 0)
msg_logger_and_die(LOG_ERR, "gethostname: %m");
/* Here on error we should do exit(RV_SYS_ERROR), instead we do exit(EXIT_FAILURE) */
hostname[STRING_LENGTH - 1] = '\0';
@ -1442,9 +1442,9 @@ static int make_dir_tree (const char *path)
static int expand_expression(char *output, unsigned int outsize,
const char *input,
const char *(*get_variable_func)(const char *variable, void *info),
void *info,
const char *devname,
const regmatch_t *ex, unsigned int numexp)
void *info,
const char *devname,
const regmatch_t *ex, unsigned int numexp)
/* [SUMMARY] Expand environment variables and regular subexpressions in string.
<output> The output expanded expression is written here.
<length> The size of the output buffer.
@ -1632,7 +1632,7 @@ const char *get_old_name (const char *devname, unsigned int namelen,
compat_name = buffer;
else
return NULL;
debug_msg_logger(LOG_INFO, "%s: scan_dev_name = %d", __FUNCTION__, i);
/* 1 == scsi/generic, 3 == scsi/cd, 10 == sbp/ */
@ -1677,10 +1677,10 @@ const char *get_old_name (const char *devname, unsigned int namelen,
indexx = atoi (devname + 5);
sprintf (buffer, fmt[i], (devname[4] == 'm') ? 'p' : 't', pty1[indexx >> 4], pty2[indexx & 0x0f]);
}
if(ENABLE_DEBUG && compat_name!=NULL)
msg_logger(LOG_INFO, "%s: compat_name %s", __FUNCTION__, compat_name);
return (compat_name);
} /* End Function get_old_name */
@ -1692,7 +1692,7 @@ static char get_old_ide_name (unsigned int major, unsigned int minor)
*/
{
char letter='y'; /* 121 */
char c='a'; /* 97 */
char c='a'; /* 97 */
int i=IDE0_MAJOR;
debug_msg_logger(LOG_INFO, __FUNCTION__);

10
miscutils/eject.c
View File

@ -28,7 +28,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
#include <sys/mount.h>
#include <mntent.h>
#include <mntent.h>
#include "busybox.h"
/* various defines swiped from linux/cdrom.h */
@ -41,16 +41,16 @@ extern int eject_main(int argc, char **argv)
unsigned long flags;
char *device;
struct mntent *m;
flags = bb_getopt_ulflags(argc, argv, "t");
device=argv[optind] ? : DEFAULT_CDROM;
if((m = find_mount_point(device, bb_path_mtab_file))) {
if(umount(m->mnt_dir))
bb_error_msg_and_die("Can't umount");
else if(ENABLE_FEATURE_MTAB_SUPPORT) erase_mtab(m->mnt_fsname);
else if(ENABLE_FEATURE_MTAB_SUPPORT) erase_mtab(m->mnt_fsname);
}
if (ioctl(bb_xopen( device, (O_RDONLY | O_NONBLOCK)),
if (ioctl(bb_xopen( device, (O_RDONLY | O_NONBLOCK)),
( flags ? CDROMCLOSETRAY : CDROMEJECT)))
{
bb_perror_msg_and_die(device);

72
miscutils/hdparm.c
View File

@ -74,8 +74,8 @@
#define RW_LONG 22 /* extra bytes in R/W LONG cmd ( < ATA-4)*/
#define START_FW_REV 23 /* ASCII firmware revision */
#define LENGTH_FW_REV 4 /* 4 words (8 bytes or characters) */
#define START_MODEL 27 /* ASCII model number */
#define LENGTH_MODEL 20 /* 20 words (40 bytes or characters) */
#define START_MODEL 27 /* ASCII model number */
#define LENGTH_MODEL 20 /* 20 words (40 bytes or characters) */
#define SECTOR_XFER_MAX 47 /* r/w multiple: max sectors xfered */
#define DWORD_IO 48 /* can do double-word IO (ATA-1 only) */
#define CAPAB_0 49 /* capabilities */
@ -121,12 +121,12 @@
in low byte, 0x40 in high byte. */
#define PSWD_CODE 92 /* master password revision code */
#define HWRST_RSLT 93 /* hardware reset result */
#define ACOUSTIC 94 /* acoustic mgmt values ( >= ATA-6) */
#define ACOUSTIC 94 /* acoustic mgmt values ( >= ATA-6) */
#define LBA_LSB 100 /* LBA: maximum. Currently only 48 */
#define LBA_MID 101 /* bits are used, but addr 103 */
#define LBA_48_MSB 102 /* has been reserved for LBA in */
#define LBA_64_MSB 103 /* the future. */
#define RM_STAT 127 /* removable media status notification feature set support */
#define RM_STAT 127 /* removable media status notification feature set support */
#define SECU_STATUS 128 /* security status */
#define CFA_PWR_MODE 160 /* CFA power mode 1 */
#define START_MEDIA 176 /* media serial number */
@ -229,7 +229,7 @@ static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */
*/
#define STBY_NID_VAL 0x37c8 /* (a) and (b) */
#define STBY_ID_VAL 0x738c /* (a) and not (b) */
#define PWRD_NID_VAL 0x8c73 /* not (a) and (b) */
#define PWRD_NID_VAL 0x8c73 /* not (a) and (b) */
#define PWRD_ID_VAL 0xc837 /* not (a) and not (b) */
/* words 47 & 59: sector_xfer_max & sector_xfer_cur */
@ -237,7 +237,7 @@ static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */
#define MULTIPLE_SETTING_VALID 0x0100 /* 1=multiple sector setting is valid */
/* word 49: capabilities 0 */
#define STD_STBY 0x2000 /* 1=standard values supported (ATA);
#define STD_STBY 0x2000 /* 1=standard values supported (ATA);
0=vendor specific values */
#define IORDY_SUP 0x0800 /* 1=support; 0=may be supported */
#define IORDY_OFF 0x0400 /* 1=may be disabled */
@ -255,7 +255,7 @@ static const char * const ata1_cfg_str[] = { /* word 0 in ATA-1 mode */
#define MODE 0xff00 /* the mode is in the MSBs */
/* word 53: whats_valid */
#define OK_W88 0x0004 /* the ultra_dma info is valid */
#define OK_W88 0x0004 /* the ultra_dma info is valid */
#define OK_W64_70 0x0002 /* see above for word descriptions */
#define OK_W54_58 0x0001 /* current cyl, head, sector, cap. info valid */
@ -314,25 +314,25 @@ static const char * const minor_str[] = { /* word 81 value: */
#endif
static const char actual_ver[] = {
/* word 81 value: */
0, /* 0x0000 WARNING: */
1, /* 0x0001 WARNING: */
1, /* 0x0002 WARNING: */
1, /* 0x0003 WARNING: */
2, /* 0x0004 WARNING: This array */
2, /* 0x0005 WARNING: corresponds */
0, /* 0x0000 WARNING: */
1, /* 0x0001 WARNING: */
1, /* 0x0002 WARNING: */
1, /* 0x0003 WARNING: */
2, /* 0x0004 WARNING: This array */
2, /* 0x0005 WARNING: corresponds */
3, /* 0x0006 WARNING: *exactly* */
2, /* 0x0007 WARNING: to the ATA/ */
3, /* 0x0008 WARNING: ATAPI version */
2, /* 0x0009 WARNING: listed in */
3, /* 0x000a WARNING: the */
3, /* 0x000b WARNING: minor_str */
2, /* 0x0009 WARNING: listed in */
3, /* 0x000a WARNING: the */
3, /* 0x000b WARNING: minor_str */
3, /* 0x000c WARNING: array */
4, /* 0x000d WARNING: above. */
4, /* 0x000e WARNING: */
4, /* 0x000f WARNING: if you change */
4, /* 0x0010 WARNING: that one, */
4, /* 0x000e WARNING: */
4, /* 0x000f WARNING: if you change */
4, /* 0x0010 WARNING: that one, */
4, /* 0x0011 WARNING: change this one */
4, /* 0x0012 WARNING: too!!! */
4, /* 0x0012 WARNING: too!!! */
5, /* 0x0013 WARNING: */
4, /* 0x0014 WARNING: */
5, /* 0x0015 WARNING: */
@ -343,7 +343,7 @@ static const char actual_ver[] = {
0, /* 0x001a WARNING: */
6, /* 0x001b WARNING: */
6, /* 0x001c WARNING: */
0 /* 0x001d-0xfffe */
0 /* 0x001d-0xfffe */
};
/* words 82-84: cmds/feats supported */
@ -387,7 +387,7 @@ static const char * const cmd_feat_str[] = {
"Adv. Power Management feature set",/* word 83 bit 3 */
"CFA feature set", /* word 83 bit 2 */
"READ/WRITE DMA QUEUED", /* word 83 bit 1 */
"DOWNLOAD MICROCODE cmd", /* word 83 bit 0 */
"DOWNLOAD MICROCODE cmd", /* word 83 bit 0 */
/* --------------*/
"", /* word 84 bit 15: !valid bit */
"", /* word 84 bit 14: valid bit */
@ -428,7 +428,7 @@ static const char * const cmd_feat_str[] = {
#define CSEL_VAL 0x0004 /* device num determined by CSEL_VAL */
/* word 127: removable media status notification feature set support */
#define RM_STAT_BITS 0x0003
#define RM_STAT_BITS 0x0003
#define RM_STAT_SUP 0x0001
/* word 128: security */
@ -774,7 +774,7 @@ static void identify (uint16_t *id_supplied, const char *devname)
like_std = 6;
}
else if(((std == 4) || (!std && (like_std < 5))) &&
((((val[INTEGRITY] & SIG) == SIG_VAL) && !chksum) ||
((((val[INTEGRITY] & SIG) == SIG_VAL) && !chksum) ||
(( val[HWRST_RSLT] & VALID) == VALID_VAL) ||
((( val[CMDS_SUPP_1] & VALID) == VALID_VAL) &&
(( val[CMDS_SUPP_1] & CMDS_W83) > 0x001f)) ) )
@ -805,14 +805,14 @@ static void identify (uint16_t *id_supplied, const char *devname)
if(!std)
printf("\n\tLikely used: %u\n",like_std);
else if(like_std > std)
printf("& some of %u\n",like_std);
printf("& some of %u\n",like_std);
else
printf("\n");
}
else
{
/* TBD: do CDROM stuff more thoroughly. For now... */
kk = 0;
kk = 0;
if(val[CDR_MINOR] == 9)
{
kk = 1;
@ -886,7 +886,7 @@ static void identify (uint16_t *id_supplied, const char *devname)
ll = (uint32_t)val[LBA_SECTS_MSB] << 16 | val[LBA_SECTS_LSB];
mm = 0; bbbig = 0;
if ( (ll > 0x00FBFC10) && (!val[LCYLS]))
printf("\tCHS addressing not supported\n");
printf("\tCHS addressing not supported\n");
else
{
jj = val[WHATS_VALID] & OK_W54_58;
@ -915,9 +915,9 @@ static void identify (uint16_t *id_supplied, const char *devname)
if( ((val[CMDS_SUPP_1] & VALID) == VALID_VAL) &&
(val[CMDS_SUPP_1] & SUPPORT_48_BIT) )
{
bbbig = (__u64)val[LBA_64_MSB] << 48 |
(__u64)val[LBA_48_MSB] << 32 |
(__u64)val[LBA_MID] << 16 |
bbbig = (__u64)val[LBA_64_MSB] << 48 |
(__u64)val[LBA_48_MSB] << 32 |
(__u64)val[LBA_MID] << 16 |
val[LBA_LSB] ;
printf("\tLBA48 user addressable sectors:%11llu\n",bbbig);
}
@ -1081,7 +1081,7 @@ static void identify (uint16_t *id_supplied, const char *devname)
/* Programmed IO stuff */
printf("\tPIO: ");
/* If a drive supports mode n (e.g. 3), it also supports all modes less
/* If a drive supports mode n (e.g. 3), it also supports all modes less
* than n (e.g. 3, 2, 1 and 0). Print all the modes. */
if((val[WHATS_VALID] & OK_W64_70) && (val[ADV_PIO_MODES] & PIO_SUP))
{
@ -1349,8 +1349,8 @@ static void dump_identity (const struct hd_driveid *id)
capacity = (id->cur_capacity1 << 16) | id->cur_capacity0;
#endif
printf(" CurCHS=%u/%u/%u, CurSects=%lu, LBA=%s",id->cur_cyls, id->cur_heads,
id->cur_sectors, capacity ,
((id->capability&2)==0)?"no":"yes");
id->cur_sectors, capacity ,
((id->capability&2)==0)?"no":"yes");
if_printf((id->capability&2),", LBAsects=%u", id->lba_capacity);
@ -1363,7 +1363,7 @@ static void dump_identity (const struct hd_driveid *id)
if_strcat((id->dma_1word & 0x200), dmodes, "*");
if_strcat((id->dma_1word & 2), dmodes, "sdma1 ");
if_strcat((id->dma_1word & 0x400), dmodes, "*");
if_strcat((id->dma_1word & 4), dmodes, "sdma2 ");
if_strcat((id->dma_1word & 4), dmodes, "sdma2 ");
if_strcat((id->dma_1word & 0xf800), dmodes, "*");
if_strcat((id->dma_1word & 0xf8), dmodes, "sdma? ");
if_strcat((id->dma_mword & 0x100), dmodes, "*");
@ -2346,7 +2346,7 @@ static void process_dev (char *devname)
no_scsi();
if (ioctl(fd, HDIO_DRIVE_CMD, &args)
&& (args[0] = WIN_CHECKPOWERMODE2) /* try again with 0x98 */
&& ioctl(fd, HDIO_DRIVE_CMD, &args))
&& ioctl(fd, HDIO_DRIVE_CMD, &args))
{
if (errno != EIO || args[0] != 0 || args[1] != 0)
state = "unknown";
@ -2456,7 +2456,7 @@ identify_abort:
if (do_ctimings)
do_time(0,fd); /*time cache */
do_time(0,fd); /*time cache */
if (do_timings)
do_time(1,fd); /*time device */
if (do_flush)

2
miscutils/mountpoint.c
View File

@ -47,7 +47,7 @@ int mountpoint_main(int argc, char **argv)
dev_t st_dev = st.st_dev;
ino_t st_ino = st.st_ino;
char *p = bb_xasprintf("%s/..", arg);
if (stat(p, &st) == 0) {
short ret = (st_dev != st.st_dev) ||
(st_dev == st.st_dev && st_ino == st.st_ino);

2
miscutils/setsid.c
View File

@ -20,7 +20,7 @@
int
setsid_main(int argc, char *argv[]) {
if (argc < 2) {
bb_show_usage();
}

8
miscutils/strings.c
View File

@ -47,23 +47,23 @@ int strings_main(int argc, char **argv)
char *string;
const char *fmt = "%s: ";
char *n_arg = "4";
opt = bb_getopt_ulflags (argc, argv, "afon:", &n_arg);
/* -a is our default behaviour */
argc -= optind;
argv += optind;
n = bb_xgetlarg(n_arg, 10, 1, INT_MAX);
string = xcalloc(n + 1, 1);
n--;
if ( argc == 0) {
fmt = "{%s}: ";
*argv = (char *)bb_msg_standard_input;
goto PIPE;
}
do {
if ((file = bb_wfopen(*argv, "r"))) {
PIPE:

2
miscutils/watchdog.c
View File

@ -29,7 +29,7 @@ static void watchdog_shutdown(int unused)
int watchdog_main(int argc, char **argv)
{
char *t_arg;
unsigned long flags;
flags = bb_getopt_ulflags(argc, argv, "t:", &t_arg);