summaryrefslogtreecommitdiff
path: root/utility.c
diff options
context:
space:
mode:
authorErik Andersen2000-02-08 19:58:47 +0000
committerErik Andersen2000-02-08 19:58:47 +0000
commite49d5ecbbe51718fa925b6890a735e5937cc2aa2 (patch)
treec90bda10731ad9333ce3b404f993354c9fc104b8 /utility.c
parentc0bf817bbc5c7867fbe8fb76d5c39f8ee802692f (diff)
downloadbusybox-e49d5ecbbe51718fa925b6890a735e5937cc2aa2.zip
busybox-e49d5ecbbe51718fa925b6890a735e5937cc2aa2.tar.gz
Some formatting updates (ran the code through indent)
-Erik
Diffstat (limited to 'utility.c')
-rw-r--r--utility.c1394
1 files changed, 696 insertions, 698 deletions
diff --git a/utility.c b/utility.c
index 10e107f..7f46f9b 100644
--- a/utility.c
+++ b/utility.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* Utility routines.
*
@@ -46,7 +47,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <ctype.h>
-#include <sys/param.h> /* for PATH_MAX */
+#include <sys/param.h> /* for PATH_MAX */
#if defined BB_FEATURE_MOUNT_LOOP
#include <fcntl.h>
@@ -70,10 +71,10 @@ const char mtab_file[] = "/etc/mtab";
extern void usage(const char *usage)
{
- fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
- BB_VER, BB_BT);
- fprintf(stderr, "Usage: %s\n", usage);
- exit FALSE;
+ fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
+ BB_VER, BB_BT);
+ fprintf(stderr, "Usage: %s\n", usage);
+ exit FALSE;
}
@@ -86,22 +87,21 @@ extern void usage(const char *usage)
* so, for example, to check if the kernel is greater than 2.2.11:
* if (get_kernel_revision() <= 2*65536+2*256+11) { <stuff> }
*/
-int
-get_kernel_revision()
+int get_kernel_revision()
{
- FILE *file;
- int major=0, minor=0, patch=0;
-
- file = fopen("/proc/sys/kernel/osrelease", "r");
- if (file == NULL) {
- /* bummer, /proc must not be mounted... */
- return( 0);
- }
- fscanf(file,"%d.%d.%d",&major,&minor,&patch);
- fclose(file);
- return major*65536 + minor*256 + patch;
+ FILE *file;
+ int major = 0, minor = 0, patch = 0;
+
+ file = fopen("/proc/sys/kernel/osrelease", "r");
+ if (file == NULL) {
+ /* bummer, /proc must not be mounted... */
+ return (0);
+ }
+ fscanf(file, "%d.%d.%d", &major, &minor, &patch);
+ fclose(file);
+ return major * 65536 + minor * 256 + patch;
}
-#endif /* BB_INIT || BB_PS */
+#endif /* BB_INIT || BB_PS */
@@ -112,19 +112,19 @@ get_kernel_revision()
*/
int isDirectory(const char *fileName, const int followLinks)
{
- struct stat statBuf;
- int status;
-
- if (followLinks == TRUE)
- status = stat(fileName, &statBuf);
- else
- status = lstat(fileName, &statBuf);
-
- if (status < 0)
- return FALSE;
- if (S_ISDIR(statBuf.st_mode))
- return TRUE;
- return FALSE;
+ struct stat statBuf;
+ int status;
+
+ if (followLinks == TRUE)
+ status = stat(fileName, &statBuf);
+ else
+ status = lstat(fileName, &statBuf);
+
+ if (status < 0)
+ return FALSE;
+ if (S_ISDIR(statBuf.st_mode))
+ return TRUE;
+ return FALSE;
}
#endif
@@ -137,148 +137,150 @@ int isDirectory(const char *fileName, const int followLinks)
* -Erik Andersen
*/
int
-copyFile( const char *srcName, const char *destName,
- int setModes, int followLinks)
+copyFile(const char *srcName, const char *destName,
+ int setModes, int followLinks)
{
- int rfd;
- int wfd;
- int rcc;
- int status;
- char buf[BUF_SIZE];
- struct stat srcStatBuf;
- struct stat dstStatBuf;
- struct utimbuf times;
-
- if (followLinks == TRUE)
- status = stat(srcName, &srcStatBuf);
- else
- status = lstat(srcName, &srcStatBuf);
-
- if (status < 0) {
- perror(srcName);
- return FALSE;
- }
+ int rfd;
+ int wfd;
+ int rcc;
+ int status;
+ char buf[BUF_SIZE];
+ struct stat srcStatBuf;
+ struct stat dstStatBuf;
+ struct utimbuf times;
+
+ if (followLinks == TRUE)
+ status = stat(srcName, &srcStatBuf);
+ else
+ status = lstat(srcName, &srcStatBuf);
- if (followLinks == TRUE)
- status = stat(destName, &dstStatBuf);
- else
- status = lstat(destName, &dstStatBuf);
+ if (status < 0) {
+ perror(srcName);
+ return FALSE;
+ }
- if (status < 0) {
- dstStatBuf.st_ino = -1;
- dstStatBuf.st_dev = -1;
- }
+ if (followLinks == TRUE)
+ status = stat(destName, &dstStatBuf);
+ else
+ status = lstat(destName, &dstStatBuf);
- if ((srcStatBuf.st_dev == dstStatBuf.st_dev) &&
- (srcStatBuf.st_ino == dstStatBuf.st_ino)) {
- fprintf(stderr, "Copying file \"%s\" to itself\n", srcName);
- return FALSE;
- }
-
- if (S_ISDIR(srcStatBuf.st_mode)) {
- //fprintf(stderr, "copying directory %s to %s\n", srcName, destName);
- /* Make sure the directory is writable */
- status = mkdir(destName, 0777777 ^ umask(0));
- if (status < 0 && errno != EEXIST) {
- perror(destName);
- return FALSE;
- }
- } else if (S_ISLNK(srcStatBuf.st_mode)) {
- char link_val[PATH_MAX + 1];
- int link_size;
-
- //fprintf(stderr, "copying link %s to %s\n", srcName, destName);
- /* Warning: This could possibly truncate silently, to PATH_MAX chars */
- link_size = readlink(srcName, &link_val[0], PATH_MAX);
- if (link_size < 0) {
- perror(srcName);
- return FALSE;
- }
- link_val[link_size] = '\0';
- status = symlink(link_val, destName);
if (status < 0) {
- perror(destName);
- return FALSE;
+ dstStatBuf.st_ino = -1;
+ dstStatBuf.st_dev = -1;
}
-#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
- if (setModes == TRUE) {
- if (lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) {
- perror(destName);
- return FALSE;
- }
+
+ if ((srcStatBuf.st_dev == dstStatBuf.st_dev) &&
+ (srcStatBuf.st_ino == dstStatBuf.st_ino)) {
+ fprintf(stderr, "Copying file \"%s\" to itself\n", srcName);
+ return FALSE;
}
+
+ if (S_ISDIR(srcStatBuf.st_mode)) {
+ //fprintf(stderr, "copying directory %s to %s\n", srcName, destName);
+ /* Make sure the directory is writable */
+ status = mkdir(destName, 0777777 ^ umask(0));
+ if (status < 0 && errno != EEXIST) {
+ perror(destName);
+ return FALSE;
+ }
+ } else if (S_ISLNK(srcStatBuf.st_mode)) {
+ char link_val[PATH_MAX + 1];
+ int link_size;
+
+ //fprintf(stderr, "copying link %s to %s\n", srcName, destName);
+ /* Warning: This could possibly truncate silently, to PATH_MAX chars */
+ link_size = readlink(srcName, &link_val[0], PATH_MAX);
+ if (link_size < 0) {
+ perror(srcName);
+ return FALSE;
+ }
+ link_val[link_size] = '\0';
+ status = symlink(link_val, destName);
+ if (status < 0) {
+ perror(destName);
+ return FALSE;
+ }
+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
+ if (setModes == TRUE) {
+ if (lchown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) {
+ perror(destName);
+ return FALSE;
+ }
+ }
#endif
- return TRUE;
- } else if (S_ISFIFO(srcStatBuf.st_mode)) {
- //fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
- if (mkfifo(destName, 0644) < 0) {
- perror(destName);
- return FALSE;
- }
- } else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode)
- || S_ISSOCK (srcStatBuf.st_mode)) {
- //fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName);
- if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
- perror(destName);
- return FALSE;
- }
- } else if (S_ISREG(srcStatBuf.st_mode)) {
- //fprintf(stderr, "copying regular file %s to %s\n", srcName, destName);
- rfd = open(srcName, O_RDONLY);
- if (rfd < 0) {
- perror(srcName);
- return FALSE;
- }
+ return TRUE;
+ } else if (S_ISFIFO(srcStatBuf.st_mode)) {
+ //fprintf(stderr, "copying fifo %s to %s\n", srcName, destName);
+ if (mkfifo(destName, 0644) < 0) {
+ perror(destName);
+ return FALSE;
+ }
+ } else if (S_ISBLK(srcStatBuf.st_mode) || S_ISCHR(srcStatBuf.st_mode)
+ || S_ISSOCK(srcStatBuf.st_mode)) {
+ //fprintf(stderr, "copying soc, blk, or chr %s to %s\n", srcName, destName);
+ if (mknod(destName, srcStatBuf.st_mode, srcStatBuf.st_rdev) < 0) {
+ perror(destName);
+ return FALSE;
+ }
+ } else if (S_ISREG(srcStatBuf.st_mode)) {
+ //fprintf(stderr, "copying regular file %s to %s\n", srcName, destName);
+ rfd = open(srcName, O_RDONLY);
+ if (rfd < 0) {
+ perror(srcName);
+ return FALSE;
+ }
- wfd = open(destName, O_WRONLY | O_CREAT | O_TRUNC, srcStatBuf.st_mode);
- if (wfd < 0) {
- perror(destName);
- close(rfd);
- return FALSE;
- }
+ wfd =
+ open(destName, O_WRONLY | O_CREAT | O_TRUNC,
+ srcStatBuf.st_mode);
+ if (wfd < 0) {
+ perror(destName);
+ close(rfd);
+ return FALSE;
+ }
- while ((rcc = read(rfd, buf, sizeof(buf))) > 0) {
- if (fullWrite(wfd, buf, rcc) < 0)
- goto error_exit;
- }
- if (rcc < 0) {
- goto error_exit;
- }
+ while ((rcc = read(rfd, buf, sizeof(buf))) > 0) {
+ if (fullWrite(wfd, buf, rcc) < 0)
+ goto error_exit;
+ }
+ if (rcc < 0) {
+ goto error_exit;
+ }
- close(rfd);
- if (close(wfd) < 0) {
- return FALSE;
+ close(rfd);
+ if (close(wfd) < 0) {
+ return FALSE;
+ }
}
- }
- if (setModes == TRUE) {
- /* This is fine, since symlinks never get here */
- if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) {
- perror(destName);
- exit FALSE;
- }
- if (chmod(destName, srcStatBuf.st_mode) < 0) {
- perror(destName);
- exit FALSE;
- }
- times.actime = srcStatBuf.st_atime;
- times.modtime = srcStatBuf.st_mtime;
- if (utime(destName, &times) < 0) {
- perror(destName);
- exit FALSE;
+ if (setModes == TRUE) {
+ /* This is fine, since symlinks never get here */
+ if (chown(destName, srcStatBuf.st_uid, srcStatBuf.st_gid) < 0) {
+ perror(destName);
+ exit FALSE;
+ }
+ if (chmod(destName, srcStatBuf.st_mode) < 0) {
+ perror(destName);
+ exit FALSE;
+ }
+ times.actime = srcStatBuf.st_atime;
+ times.modtime = srcStatBuf.st_mtime;
+ if (utime(destName, &times) < 0) {
+ perror(destName);
+ exit FALSE;
+ }
}
- }
- return TRUE;
+ return TRUE;
- error_exit:
- perror(destName);
- close(rfd);
- close(wfd);
+ error_exit:
+ perror(destName);
+ close(rfd);
+ close(wfd);
- return FALSE;
+ return FALSE;
}
-#endif /* BB_CP_MV */
+#endif /* BB_CP_MV */
@@ -289,16 +291,16 @@ copyFile( const char *srcName, const char *destName,
/* The special bits. If set, display SMODE0/1 instead of MODE0/1 */
static const mode_t SBIT[] = {
- 0, 0, S_ISUID,
- 0, 0, S_ISGID,
- 0, 0, S_ISVTX
+ 0, 0, S_ISUID,
+ 0, 0, S_ISGID,
+ 0, 0, S_ISVTX
};
/* The 9 mode bits to test */
static const mode_t MBIT[] = {
- S_IRUSR, S_IWUSR, S_IXUSR,
- S_IRGRP, S_IWGRP, S_IXGRP,
- S_IROTH, S_IWOTH, S_IXOTH
+ S_IRUSR, S_IWUSR, S_IXUSR,
+ S_IRGRP, S_IWGRP, S_IXGRP,
+ S_IROTH, S_IWOTH, S_IXOTH
};
#define MODE1 "rwxrwxrwx"
@@ -312,21 +314,20 @@ static const mode_t MBIT[] = {
*/
const char *modeString(int mode)
{
- static char buf[12];
-
- int i;
- buf[0] = TYPECHAR(mode);
- for (i=0; i<9; i++) {
- if (mode & SBIT[i])
- buf[i+1] = (mode & MBIT[i])?
- SMODE1[i] : SMODE0[i];
- else
- buf[i+1] = (mode & MBIT[i])?
- MODE1[i] : MODE0[i];
- }
- return buf;
+ static char buf[12];
+
+ int i;
+
+ buf[0] = TYPECHAR(mode);
+ for (i = 0; i < 9; i++) {
+ if (mode & SBIT[i])
+ buf[i + 1] = (mode & MBIT[i]) ? SMODE1[i] : SMODE0[i];
+ else
+ buf[i + 1] = (mode & MBIT[i]) ? MODE1[i] : MODE0[i];
+ }
+ return buf;
}
-#endif /* BB_TAR || BB_LS */
+#endif /* BB_TAR || BB_LS */
#if defined BB_TAR
@@ -336,25 +337,25 @@ const char *modeString(int mode)
*/
const char *timeString(time_t timeVal)
{
- time_t now;
- char *str;
- static char buf[26];
+ time_t now;
+ char *str;
+ static char buf[26];
- time(&now);
+ time(&now);
- str = ctime(&timeVal);
+ str = ctime(&timeVal);
- strcpy(buf, &str[4]);
- buf[12] = '\0';
+ strcpy(buf, &str[4]);
+ buf[12] = '\0';
- if ((timeVal > now) || (timeVal < now - 365 * 24 * 60 * 60L)) {
- strcpy(&buf[7], &str[20]);
- buf[11] = '\0';
- }
+ if ((timeVal > now) || (timeVal < now - 365 * 24 * 60 * 60L)) {
+ strcpy(&buf[7], &str[20]);
+ buf[11] = '\0';
+ }
- return buf;
+ return buf;
}
-#endif /* BB_TAR */
+#endif /* BB_TAR */
#if defined BB_TAR || defined BB_CP_MV
/*
@@ -364,25 +365,25 @@ const char *timeString(time_t timeVal)
*/
int fullWrite(int fd, const char *buf, int len)
{
- int cc;
- int total;
+ int cc;
+ int total;
- total = 0;
+ total = 0;
- while (len > 0) {
- cc = write(fd, buf, len);
+ while (len > 0) {
+ cc = write(fd, buf, len);
- if (cc < 0)
- return -1;
+ if (cc < 0)
+ return -1;
- buf += cc;
- total += cc;
- len -= cc;
- }
+ buf += cc;
+ total += cc;
+ len -= cc;
+ }
- return total;
+ return total;
}
-#endif /* BB_TAR || BB_CP_MV */
+#endif /* BB_TAR || BB_CP_MV */
#if defined BB_TAR || defined BB_TAIL
@@ -394,28 +395,28 @@ int fullWrite(int fd, const char *buf, int len)
*/
int fullRead(int fd, char *buf, int len)
{
- int cc;
- int total;
+ int cc;
+ int total;
- total = 0;
+ total = 0;
- while (len > 0) {
- cc = read(fd, buf, len);
+ while (len > 0) {
+ cc = read(fd, buf, len);
- if (cc < 0)
- return -1;
+ if (cc < 0)
+ return -1;
- if (cc == 0)
- break;
+ if (cc == 0)
+ break;
- buf += cc;
- total += cc;
- len -= cc;
- }
+ buf += cc;
+ total += cc;
+ len -= cc;
+ }
- return total;
+ return total;
}
-#endif /* BB_TAR || BB_TAIL */
+#endif /* BB_TAR || BB_TAIL */
#if defined (BB_CHMOD_CHOWN_CHGRP) \
@@ -434,102 +435,104 @@ int fullRead(int fd, char *buf, int len)
* is so stinking huge.
*/
int recursiveAction(const char *fileName,
- int recurse, int followLinks, int depthFirst,
- int (*fileAction) (const char *fileName,
- struct stat* statbuf),
- int (*dirAction) (const char *fileName,
- struct stat* statbuf))
+ int recurse, int followLinks, int depthFirst,
+ int (*fileAction) (const char *fileName,
+ struct stat * statbuf),
+ int (*dirAction) (const char *fileName,
+ struct stat * statbuf))
{
- int status;
- struct stat statbuf;
- struct dirent *next;
+ int status;
+ struct stat statbuf;
+ struct dirent *next;
- if (followLinks == TRUE)
- status = stat(fileName, &statbuf);
- else
- status = lstat(fileName, &statbuf);
+ if (followLinks == TRUE)
+ status = stat(fileName, &statbuf);
+ else
+ status = lstat(fileName, &statbuf);
- if (status < 0) {
+ if (status < 0) {
#ifdef BB_DEBUG_PRINT_SCAFFOLD
- fprintf(stderr,
- "status=%d followLinks=%d TRUE=%d\n",
- status, followLinks, TRUE);
+ fprintf(stderr,
+ "status=%d followLinks=%d TRUE=%d\n",
+ status, followLinks, TRUE);
#endif
- perror(fileName);
- return FALSE;
- }
-
- if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode)) ) {
- if (fileAction == NULL)
- return TRUE;
- else
- return fileAction(fileName, &statbuf);
- }
-
- if (recurse == FALSE) {
- if (S_ISDIR(statbuf.st_mode)) {
- if (dirAction != NULL)
- return (dirAction(fileName, &statbuf));
- else
- return TRUE;
- }
- }
-
- if (S_ISDIR(statbuf.st_mode)) {
- DIR *dir;
- dir = opendir(fileName);
- if (!dir) {
- perror(fileName);
- return FALSE;
- }
- if (dirAction != NULL && depthFirst == FALSE) {
- status = dirAction(fileName, &statbuf);
- if (status == FALSE) {
perror(fileName);
return FALSE;
- }
}
- while ((next = readdir(dir)) != NULL) {
- char nextFile[PATH_MAX + 1];
- if ((strcmp(next->d_name, "..") == 0)
- || (strcmp(next->d_name, ".") == 0)) {
- continue;
- }
- if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
- fprintf(stderr, name_too_long, "ftw");
- return FALSE;
- }
- sprintf(nextFile, "%s/%s", fileName, next->d_name);
- status =
- recursiveAction(nextFile, TRUE, followLinks, depthFirst,
- fileAction, dirAction);
- if (status < 0) {
- closedir(dir);
- return FALSE;
- }
+
+ if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) {
+ if (fileAction == NULL)
+ return TRUE;
+ else
+ return fileAction(fileName, &statbuf);
}
- status = closedir(dir);
- if (status < 0) {
- perror(fileName);
- return FALSE;
+
+ if (recurse == FALSE) {
+ if (S_ISDIR(statbuf.st_mode)) {
+ if (dirAction != NULL)
+ return (dirAction(fileName, &statbuf));
+ else
+ return TRUE;
+ }
}
- if (dirAction != NULL && depthFirst == TRUE) {
- status = dirAction(fileName, &statbuf);
- if (status == FALSE) {
- perror(fileName);
- return FALSE;
- }
+
+ if (S_ISDIR(statbuf.st_mode)) {
+ DIR *dir;
+
+ dir = opendir(fileName);
+ if (!dir) {
+ perror(fileName);
+ return FALSE;
+ }
+ if (dirAction != NULL && depthFirst == FALSE) {
+ status = dirAction(fileName, &statbuf);
+ if (status == FALSE) {
+ perror(fileName);
+ return FALSE;
+ }
+ }
+ while ((next = readdir(dir)) != NULL) {
+ char nextFile[PATH_MAX + 1];
+
+ if ((strcmp(next->d_name, "..") == 0)
+ || (strcmp(next->d_name, ".") == 0)) {
+ continue;
+ }
+ if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
+ fprintf(stderr, name_too_long, "ftw");
+ return FALSE;
+ }
+ sprintf(nextFile, "%s/%s", fileName, next->d_name);
+ status =
+ recursiveAction(nextFile, TRUE, followLinks, depthFirst,
+ fileAction, dirAction);
+ if (status < 0) {
+ closedir(dir);
+ return FALSE;
+ }
+ }
+ status = closedir(dir);
+ if (status < 0) {
+ perror(fileName);
+ return FALSE;
+ }
+ if (dirAction != NULL && depthFirst == TRUE) {
+ status = dirAction(fileName, &statbuf);
+ if (status == FALSE) {
+ perror(fileName);
+ return FALSE;
+ }
+ }
+ } else {
+ if (fileAction == NULL)
+ return TRUE;
+ else
+ return fileAction(fileName, &statbuf);
}
- } else {
- if (fileAction == NULL)
- return TRUE;
- else
- return fileAction(fileName, &statbuf);
- }
- return TRUE;
+ return TRUE;
}
-#endif /* BB_CHMOD_CHOWN_CHGRP || BB_CP_MV || BB_FIND || BB_LS || BB_INSMOD */
+#endif /* BB_CHMOD_CHOWN_CHGRP || BB_CP_MV || BB_FIND || BB_LS || BB_INSMOD */
@@ -540,30 +543,30 @@ int recursiveAction(const char *fileName,
* while all previous ones get default protections. Errors are not reported
* here, as failures to restore files can be reported later.
*/
-extern int createPath (const char *name, int mode)
+extern int createPath(const char *name, int mode)
{
- char *cp;
- char *cpOld;
- char buf[PATH_MAX + 1];
- int retVal=0;
-
- strcpy( buf, name);
- for (cp = buf; *cp == '/'; cp++);
- cp = strchr(cp, '/');
- while (cp) {
- cpOld = cp;
- cp = strchr(cp + 1, '/');
- *cpOld = '\0';
- retVal = mkdir(buf, cp ? 0777 : mode);
- if (retVal != 0 && errno != EEXIST) {
- perror(buf);
- return FALSE;
+ char *cp;
+ char *cpOld;
+ char buf[PATH_MAX + 1];
+ int retVal = 0;
+
+ strcpy(buf, name);
+ for (cp = buf; *cp == '/'; cp++);
+ cp = strchr(cp, '/');
+ while (cp) {
+ cpOld = cp;
+ cp = strchr(cp + 1, '/');
+ *cpOld = '\0';
+ retVal = mkdir(buf, cp ? 0777 : mode);
+ if (retVal != 0 && errno != EEXIST) {
+ perror(buf);
+ return FALSE;
+ }
+ *cpOld = '/';
}
- *cpOld = '/';
- }
- return TRUE;
+ return TRUE;
}
-#endif /* BB_TAR || BB_MKDIR */
+#endif /* BB_TAR || BB_MKDIR */
@@ -572,67 +575,68 @@ extern int createPath (const char *name, int mode)
-extern int
-parse_mode( const char* s, mode_t* theMode)
+extern int parse_mode(const char *s, mode_t * theMode)
{
- mode_t andMode = S_ISVTX|S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO;
+ mode_t andMode =
+
+ S_ISVTX | S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
mode_t orMode = 0;
- mode_t mode = 0;
- mode_t groups = 0;
- char type;
- char c;
+ mode_t mode = 0;
+ mode_t groups = 0;
+ char type;
+ char c;
do {
- for ( ; ; ) {
- switch ( c = *s++ ) {
+ for (;;) {
+ switch (c = *s++) {
case '\0':
return -1;
case 'u':
- groups |= S_ISUID|S_IRWXU;
+ groups |= S_ISUID | S_IRWXU;
continue;
case 'g':
- groups |= S_ISGID|S_IRWXG;
+ groups |= S_ISGID | S_IRWXG;
continue;
case 'o':
groups |= S_IRWXO;
continue;
case 'a':
- groups |= S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO;
+ groups |= S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
continue;
case '+':
case '=':
case '-':
type = c;
- if ( groups == 0 ) /* The default is "all" */
- groups |= S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO;
+ if (groups == 0) /* The default is "all" */
+ groups |=
+ S_ISUID | S_ISGID | S_IRWXU | S_IRWXG | S_IRWXO;
break;
default:
- if ( isdigit(c) && c >= '0' && c <= '7' &&
- mode == 0 && groups == 0 ) {
+ if (isdigit(c) && c >= '0' && c <= '7' &&
+ mode == 0 && groups == 0) {
*theMode = strtol(--s, NULL, 8);
return (TRUE);
- }
- else
+ } else
return (FALSE);
}
break;
}
- while ( (c = *s++) != '\0' ) {
- switch ( c ) {
+ while ((c = *s++) != '\0') {
+ switch (c) {
case ',':
break;
case 'r':
- mode |= S_IRUSR|S_IRGRP|S_IROTH;
+ mode |= S_IRUSR | S_IRGRP | S_IROTH;
continue;
case 'w':
- mode |= S_IWUSR|S_IWGRP|S_IWOTH;
+ mode |= S_IWUSR | S_IWGRP | S_IWOTH;
continue;
case 'x':
- mode |= S_IXUSR|S_IXGRP|S_IXOTH;
+ mode |= S_IXUSR | S_IXGRP | S_IXOTH;
continue;
case 's':
- mode |= S_IXGRP|S_ISUID|S_ISGID;
+ mode |= S_IXGRP | S_ISUID | S_ISGID;
continue;
case 't':
mode |= 0;
@@ -640,11 +644,11 @@ parse_mode( const char* s, mode_t* theMode)
default:
*theMode &= andMode;
*theMode |= orMode;
- return( TRUE);
+ return (TRUE);
}
break;
}
- switch ( type ) {
+ switch (type) {
case '=':
andMode &= ~(groups);
/* fall through */
@@ -656,14 +660,14 @@ parse_mode( const char* s, mode_t* theMode)
orMode &= andMode;
break;
}
- } while ( c == ',' );
+ } while (c == ',');
*theMode &= andMode;
*theMode |= orMode;
return (TRUE);
}
-#endif /* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR */
+#endif /* BB_CHMOD_CHOWN_CHGRP || BB_MKDIR */
@@ -676,82 +680,77 @@ parse_mode( const char* s, mode_t* theMode)
/* Use this to avoid needing the glibc NSS stuff
* This uses storage buf to hold things.
* */
-uid_t
-my_getid(const char *filename, char *name, uid_t id)
+uid_t my_getid(const char *filename, char *name, uid_t id)
{
FILE *file;
char *rname, *start, *end, buf[128];
uid_t rid;
- file=fopen(filename,"r");
+ file = fopen(filename, "r");
if (file == NULL) {
- perror(filename);
- return (-1);
+ perror(filename);
+ return (-1);
}
- while (fgets (buf, 128, file) != NULL) {
+ while (fgets(buf, 128, file) != NULL) {
if (buf[0] == '#')
continue;
start = buf;
- end = strchr (start, ':');
+ end = strchr(start, ':');
if (end == NULL)
continue;
*end = '\0';
rname = start;
start = end + 1;
- end = strchr (start, ':');
+ end = strchr(start, ':');
if (end == NULL)
continue;
start = end + 1;
- rid = (uid_t) strtol (start, &end, 10);
+ rid = (uid_t) strtol(start, &end, 10);
if (end == start)
continue;
if (name) {
- if (0 == strcmp(rname, name)) {
- fclose( file);
- return( rid);
- }
- }
- if ( id != -1 && id == rid ) {
- strncpy(name, rname, 8);
- fclose( file);
- return( TRUE);
+ if (0 == strcmp(rname, name)) {
+ fclose(file);
+ return (rid);
+ }
+ }
+ if (id != -1 && id == rid) {
+ strncpy(name, rname, 8);
+ fclose(file);
+ return (TRUE);
}
}
fclose(file);
return (-1);
}
-uid_t
-my_getpwnam(char *name)
+uid_t my_getpwnam(char *name)
{
- return my_getid("/etc/passwd", name, -1);
+ return my_getid("/etc/passwd", name, -1);
}
-gid_t
-my_getgrnam(char *name)
+gid_t my_getgrnam(char *name)
{
- return my_getid("/etc/group", name, -1);
+ return my_getid("/etc/group", name, -1);
}
-void
-my_getpwuid(char* name, uid_t uid)
+void my_getpwuid(char *name, uid_t uid)
{
- my_getid("/etc/passwd", name, uid);
+ my_getid("/etc/passwd", name, uid);
}
-void
-my_getgrgid(char* group, gid_t gid)
+void my_getgrgid(char *group, gid_t gid)
{
- my_getid("/etc/group", group, gid);
+ my_getid("/etc/group", group, gid);
}
-#endif /* BB_CHMOD_CHOWN_CHGRP || BB_PS */
+#endif /* BB_CHMOD_CHOWN_CHGRP || BB_PS */
@@ -762,43 +761,42 @@ my_getgrgid(char* group, gid_t gid)
#include <linux/kd.h>
#include <sys/ioctl.h>
-int is_a_console(int fd)
+int is_a_console(int fd)
{
- char arg;
-
- arg = 0;
- return (ioctl(fd, KDGKBTYPE, &arg) == 0
- && ((arg == KB_101) || (arg == KB_84)));
+ char arg;
+
+ arg = 0;
+ return (ioctl(fd, KDGKBTYPE, &arg) == 0
+ && ((arg == KB_101) || (arg == KB_84)));
}
-static int open_a_console(char *fnam)
+static int open_a_console(char *fnam)
{
- int fd;
-
- /* try read-only */
- fd = open(fnam, O_RDWR);
-
- /* if failed, try read-only */
- if (fd < 0 && errno == EACCES)
- fd = open(fnam, O_RDONLY);
-
- /* if failed, try write-only */
- if (fd < 0 && errno == EACCES)
- fd = open(fnam, O_WRONLY);
-
- /* if failed, fail */
- if (fd < 0)
- return -1;
-
- /* if not a console, fail */
- if (! is_a_console(fd))
- {
- close(fd);
- return -1;
- }
-
- /* success */
- return fd;
+ int fd;
+
+ /* try read-only */
+ fd = open(fnam, O_RDWR);
+
+ /* if failed, try read-only */
+ if (fd < 0 && errno == EACCES)
+ fd = open(fnam, O_RDONLY);
+
+ /* if failed, try write-only */
+ if (fd < 0 && errno == EACCES)
+ fd = open(fnam, O_WRONLY);
+
+ /* if failed, fail */
+ if (fd < 0)
+ return -1;
+
+ /* if not a console, fail */
+ if (!is_a_console(fd)) {
+ close(fd);
+ return -1;
+ }
+
+ /* success */
+ return fd;
}
/*
@@ -809,59 +807,59 @@ static int open_a_console(char *fnam)
* if tty_name is non-NULL, try this one instead.
*/
-int get_console_fd(char* tty_name)
+int get_console_fd(char *tty_name)
{
- int fd;
+ int fd;
- if (tty_name)
- {
- if (-1 == (fd = open_a_console(tty_name)))
- return -1;
- else
- return fd;
- }
-
- fd = open_a_console("/dev/tty");
- if (fd >= 0)
- return fd;
-
- fd = open_a_console("/dev/tty0");
- if (fd >= 0)
- return fd;
-
- fd = open_a_console("/dev/console");
- if (fd >= 0)
- return fd;
-
- for (fd = 0; fd < 3; fd++)
- if (is_a_console(fd))
- return fd;
-
- fprintf(stderr,
- "Couldnt get a file descriptor referring to the console\n");
- return -1; /* total failure */
+ if (tty_name) {
+ if (-1 == (fd = open_a_console(tty_name)))
+ return -1;
+ else
+ return fd;
+ }
+
+ fd = open_a_console("/dev/tty");
+ if (fd >= 0)
+ return fd;
+
+ fd = open_a_console("/dev/tty0");
+ if (fd >= 0)
+ return fd;
+
+ fd = open_a_console("/dev/console");
+ if (fd >= 0)
+ return fd;
+
+ for (fd = 0; fd < 3; fd++)
+ if (is_a_console(fd))
+ return fd;
+
+ fprintf(stderr,
+ "Couldnt get a file descriptor referring to the console\n");
+ return -1; /* total failure */
}
-#endif /* BB_CHVT || BB_DEALLOCVT */
+#endif /* BB_CHVT || BB_DEALLOCVT */
-#if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED)
+#if !defined BB_REGEXP && (defined BB_GREP || defined BB_SED)
/* Do a case insensitive strstr() */
-char* stristr(char *haystack, const char *needle)
+char *stristr(char *haystack, const char *needle)
{
- int len = strlen( needle );
- while( *haystack ) {
- if( !strncasecmp( haystack, needle, len ) )
- break;
- haystack++;
- }
+ int len = strlen(needle);
- if( !(*haystack) )
- haystack = NULL;
+ while (*haystack) {
+ if (!strncasecmp(haystack, needle, len))
+ break;
+ haystack++;
+ }
- return haystack;
+ if (!(*haystack))
+ haystack = NULL;
+
+ return haystack;
}
/* This tries to find a needle in a haystack, but does so by
@@ -873,56 +871,61 @@ char* stristr(char *haystack, const char *needle)
extern int find_match(char *haystack, char *needle, int ignoreCase)
{
- if (ignoreCase == FALSE)
- haystack = strstr (haystack, needle);
- else
- haystack = stristr (haystack, needle);
- if (haystack == NULL)
- return FALSE;
- return TRUE;
+ if (ignoreCase == FALSE)
+ haystack = strstr(haystack, needle);
+ else
+ haystack = stristr(haystack, needle);
+ if (haystack == NULL)
+ return FALSE;
+ return TRUE;
}
/* This performs substitutions after a string match has been found. */
-extern int replace_match(char *haystack, char *needle, char *newNeedle, int ignoreCase)
+extern int replace_match(char *haystack, char *needle, char *newNeedle,
+ int ignoreCase)
{
- int foundOne=0;
- char *where, *slider, *slider1, *oldhayStack;
+ int foundOne = 0;
+ char *where, *slider, *slider1, *oldhayStack;
- if (ignoreCase == FALSE)
- where = strstr (haystack, needle);
- else
- where = stristr (haystack, needle);
+ if (ignoreCase == FALSE)
+ where = strstr(haystack, needle);
+ else
+ where = stristr(haystack, needle);
- if (strcmp(needle, newNeedle)==0)
- return FALSE;
+ if (strcmp(needle, newNeedle) == 0)
+ return FALSE;
- oldhayStack = (char*)malloc((unsigned)(strlen(haystack)));
- while(where!=NULL) {
- foundOne++;
- strcpy(oldhayStack, haystack);
+ oldhayStack = (char *) malloc((unsigned) (strlen(haystack)));
+ while (where != NULL) {
+ foundOne++;
+ strcpy(oldhayStack, haystack);
#if 0
- if ( strlen(newNeedle) > strlen(needle)) {
- haystack = (char *)realloc(haystack, (unsigned)(strlen(haystack) -
- strlen(needle) + strlen(newNeedle)));
- }
+ if (strlen(newNeedle) > strlen(needle)) {
+ haystack =
+ (char *) realloc(haystack,
+ (unsigned) (strlen(haystack) -
+ strlen(needle) +
+ strlen(newNeedle)));
+ }
#endif
- for(slider=haystack,slider1=oldhayStack;slider!=where;slider++,slider1++);
- *slider=0;
- haystack=strcat(haystack, newNeedle);
- slider1+=strlen(needle);
- haystack = strcat(haystack, slider1);
- where = strstr (slider, needle);
- }
- free( oldhayStack);
-
- if (foundOne > 0)
- return TRUE;
- else
- return FALSE;
+ for (slider = haystack, slider1 = oldhayStack; slider != where;
+ slider++, slider1++);
+ *slider = 0;
+ haystack = strcat(haystack, newNeedle);
+ slider1 += strlen(needle);
+ haystack = strcat(haystack, slider1);
+ where = strstr(slider, needle);
+ }
+ free(oldhayStack);
+
+ if (foundOne > 0)
+ return TRUE;
+ else
+ return FALSE;
}
-#endif /* ! BB_REGEXP && (BB_GREP || BB_SED) */
+#endif /* ! BB_REGEXP && (BB_GREP || BB_SED) */
#if defined BB_FIND
@@ -940,91 +943,84 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle, int igno
* provided that this copyright notice remains intact.
* Permission to distribute this code under the GPL has been granted.
*/
-extern int
-check_wildcard_match(const char* text, const char* pattern)
+extern int check_wildcard_match(const char *text, const char *pattern)
{
- const char* retryPat;
- const char* retryText;
- int ch;
- int found;
-
- retryPat = NULL;
- retryText = NULL;
-
- while (*text || *pattern)
- {
- ch = *pattern++;
-
- switch (ch)
- {
- case '*':
- retryPat = pattern;
- retryText = text;
- break;
+ const char *retryPat;
+ const char *retryText;
+ int ch;
+ int found;
- case '[':
- found = FALSE;
+ retryPat = NULL;
+ retryText = NULL;
- while ((ch = *pattern++) != ']')
- {
- if (ch == '\\')
- ch = *pattern++;
+ while (*text || *pattern) {
+ ch = *pattern++;
- if (ch == '\0')
- return FALSE;
+ switch (ch) {
+ case '*':
+ retryPat = pattern;
+ retryText = text;
+ break;
- if (*text == ch)
- found = TRUE;
- }
+ case '[':
+ found = FALSE;
- //if (!found)
- if (found==TRUE)
- {
- pattern = retryPat;
- text = ++retryText;
- }
+ while ((ch = *pattern++) != ']') {
+ if (ch == '\\')
+ ch = *pattern++;
+
+ if (ch == '\0')
+ return FALSE;
- /* fall into next case */
+ if (*text == ch)
+ found = TRUE;
+ }
- case '?':
- if (*text++ == '\0')
- return FALSE;
+ //if (!found)
+ if (found == TRUE) {
+ pattern = retryPat;
+ text = ++retryText;
+ }
- break;
+ /* fall into next case */
- case '\\':
- ch = *pattern++;
+ case '?':
+ if (*text++ == '\0')
+ return FALSE;
- if (ch == '\0')
- return FALSE;
+ break;
+
+ case '\\':
+ ch = *pattern++;
- /* fall into next case */
+ if (ch == '\0')
+ return FALSE;
- default:
- if (*text == ch)
- {
- if (*text)
- text++;
- break;
- }
+ /* fall into next case */
- if (*text)
- {
- pattern = retryPat;
- text = ++retryText;
- break;
+ default:
+ if (*text == ch) {
+ if (*text)
+ text++;
+ break;
+ }
+
+ if (*text) {
+ pattern = retryPat;
+ text = ++retryText;
+ break;
+ }
+
+ return FALSE;
}
- return FALSE;
+ if (pattern == NULL)
+ return FALSE;
}
- if (pattern == NULL)
- return FALSE;
- }
-
- return TRUE;
+ return TRUE;
}
-#endif /* BB_FIND */
+#endif /* BB_FIND */
@@ -1039,36 +1035,36 @@ check_wildcard_match(const char* text, const char* pattern)
*/
extern struct mntent *findMountPoint(const char *name, const char *table)
{
- struct stat s;
- dev_t mountDevice;
- FILE *mountTable;
- struct mntent *mountEntry;
+ struct stat s;
+ dev_t mountDevice;
+ FILE *mountTable;
+ struct mntent *mountEntry;
- if (stat(name, &s) != 0)
- return 0;
+ if (stat(name, &s) != 0)
+ return 0;
- if ((s.st_mode & S_IFMT) == S_IFBLK)
- mountDevice = s.st_rdev;
- else
- mountDevice = s.st_dev;
+ if ((s.st_mode & S_IFMT) == S_IFBLK)
+ mountDevice = s.st_rdev;
+ else
+ mountDevice = s.st_dev;
- if ((mountTable = setmntent(table, "r")) == 0)
- return 0;
+ if ((mountTable = setmntent(table, "r")) == 0)
+ return 0;
- while ((mountEntry = getmntent(mountTable)) != 0) {
- if (strcmp(name, mountEntry->mnt_dir) == 0
- || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */
- break;
- if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice) /* Match the device. */
- break;
- if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice) /* Match the directory's mount point. */
- break;
- }
- endmntent(mountTable);
- return mountEntry;
+ while ((mountEntry = getmntent(mountTable)) != 0) {
+ if (strcmp(name, mountEntry->mnt_dir) == 0
+ || strcmp(name, mountEntry->mnt_fsname) == 0) /* String match. */
+ break;
+ if (stat(mountEntry->mnt_fsname, &s) == 0 && s.st_rdev == mountDevice) /* Match the device. */
+ break;
+ if (stat(mountEntry->mnt_dir, &s) == 0 && s.st_dev == mountDevice) /* Match the directory's mount point. */
+ break;
+ }
+ endmntent(mountTable);
+ return mountEntry;
}
-#endif /* BB_DF || BB_MTAB */
+#endif /* BB_DF || BB_MTAB */
@@ -1077,74 +1073,74 @@ extern struct mntent *findMountPoint(const char *name, const char *table)
* Read a number with a possible multiplier.
* Returns -1 if the number format is illegal.
*/
-extern long getNum (const char *cp)
+extern long getNum(const char *cp)
{
- long value;
+ long value;
- if (!isDecimal (*cp))
- return -1;
+ if (!isDecimal(*cp))
+ return -1;
- value = 0;
+ value = 0;
- while (isDecimal (*cp))
- value = value * 10 + *cp++ - '0';
+ while (isDecimal(*cp))
+ value = value * 10 + *cp++ - '0';
- switch (*cp++) {
- case 'M':
- case 'm': /* `tail' uses it traditionally */
- value *= 1048576;
- break;
+ switch (*cp++) {
+ case 'M':
+ case 'm': /* `tail' uses it traditionally */
+ value *= 1048576;
+ break;
- case 'k':
- value *= 1024;
- break;
+ case 'k':
+ value *= 1024;
+ break;
- case 'b':
- value *= 512;
- break;
+ case 'b':
+ value *= 512;
+ break;
- case 'w':
- value *= 2;
- break;
+ case 'w':
+ value *= 2;
+ break;
- case '\0':
- return value;
+ case '\0':
+ return value;
- default:
- return -1;
- }
+ default:
+ return -1;
+ }
- if (*cp)
- return -1;
+ if (*cp)
+ return -1;
- return value;
+ return value;
}
-#endif /* BB_DD || BB_TAIL */
+#endif /* BB_DD || BB_TAIL */
#if defined BB_INIT || defined BB_SYSLOGD
/* try to open up the specified device */
extern int device_open(char *device, int mode)
{
- int m, f, fd = -1;
+ int m, f, fd = -1;
- m = mode | O_NONBLOCK;
+ m = mode | O_NONBLOCK;
- /* Retry up to 5 times */
- for (f = 0; f < 5; f++)
- if ((fd = open(device, m, 0600)) >= 0)
- break;
- if (fd < 0)
+ /* Retry up to 5 times */
+ for (f = 0; f < 5; f++)
+ if ((fd = open(device, m, 0600)) >= 0)
+ break;
+ if (fd < 0)
+ return fd;
+ /* Reset original flags. */
+ if (m != mode)
+ fcntl(fd, F_SETFL, mode);
return fd;
- /* Reset original flags. */
- if (m != mode)
- fcntl(fd, F_SETFL, mode);
- return fd;
}
-#endif /* BB_INIT BB_SYSLOGD */
+#endif /* BB_INIT BB_SYSLOGD */
-#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT
+#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT
#if ! defined BB_FEATURE_USE_PROCFS
#error Sorry, I depend on the /proc filesystem right now.
@@ -1158,101 +1154,103 @@ extern int device_open(char *device, int mode)
* 0 failure
* pid when init's pid is found.
*/
-extern pid_t
-findInitPid()
+extern pid_t findInitPid()
{
- pid_t init_pid;
- char filename[256];
- char buffer[256];
-
- /* no need to opendir ;) */
- for (init_pid = 1; init_pid < 65536; init_pid++) {
- FILE *status;
-
- sprintf(filename, "/proc/%d/status", init_pid);
- status = fopen(filename, "r");
- if (!status) { continue; }
- fgets(buffer, 256, status);
- fclose(status);
-
- if ( (strstr(buffer, "init\n") != NULL )) {
- return init_pid;
+ pid_t init_pid;
+ char filename[256];
+ char buffer[256];
+
+ /* no need to opendir ;) */
+ for (init_pid = 1; init_pid < 65536; init_pid++) {
+ FILE *status;
+
+ sprintf(filename, "/proc/%d/status", init_pid);
+ status = fopen(filename, "r");
+ if (!status) {
+ continue;
+ }
+ fgets(buffer, 256, status);
+ fclose(status);
+
+ if ((strstr(buffer, "init\n") != NULL)) {
+ return init_pid;
+ }
}
- }
- return 0;
+ return 0;
}
-#endif /* BB_INIT || BB_HALT || BB_REBOOT */
+#endif /* BB_INIT || BB_HALT || BB_REBOOT */
#if defined BB_GUNZIP \
|| defined BB_GZIP \
|| defined BB_PRINTF \
|| defined BB_TAIL
-extern void *xmalloc (size_t size)
+extern void *xmalloc(size_t size)
{
- void *cp = malloc (size);
+ void *cp = malloc(size);
- if (cp == NULL) {
- error("out of memory");
- }
- return cp;
+ if (cp == NULL) {
+ error("out of memory");
+ }
+ return cp;
}
extern void error(char *msg)
{
- fprintf(stderr, "\n%s\n", msg);
- exit(1);
+ fprintf(stderr, "\n%s\n", msg);
+ exit(1);
}
-#endif /* BB_GUNZIP || BB_GZIP || BB_PRINTF || BB_TAIL */
+#endif /* BB_GUNZIP || BB_GZIP || BB_PRINTF || BB_TAIL */
#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT)
extern int vdprintf(int d, const char *format, va_list ap)
{
- char buf[BUF_SIZE];
- int len;
+ char buf[BUF_SIZE];
+ int len;
- len = vsprintf(buf, format, ap);
- return write(d, buf, len);
+ len = vsprintf(buf, format, ap);
+ return write(d, buf, len);
}
-#endif /* BB_SYSLOGD */
+#endif /* BB_SYSLOGD */
#if defined BB_FEATURE_MOUNT_LOOP
extern int del_loop(const char *device)
{
- int fd;
-
- if ((fd = open(device, O_RDONLY)) < 0) {
- perror(device);
- return( FALSE);
- }
- if (ioctl(fd, LOOP_CLR_FD, 0) < 0) {
- perror("ioctl: LOOP_CLR_FD");
- return( FALSE);
- }
- close(fd);
- return( TRUE);
+ int fd;
+
+ if ((fd = open(device, O_RDONLY)) < 0) {
+ perror(device);
+ return (FALSE);
+ }
+ if (ioctl(fd, LOOP_CLR_FD, 0) < 0) {
+ perror("ioctl: LOOP_CLR_FD");
+ return (FALSE);
+ }
+ close(fd);
+ return (TRUE);
}
-extern int set_loop(const char *device, const char *file, int offset, int *loopro)
+extern int set_loop(const char *device, const char *file, int offset,
+ int *loopro)
{
struct loop_info loopinfo;
- int fd, ffd, mode;
-
+ int fd, ffd, mode;
+
mode = *loopro ? O_RDONLY : O_RDWR;
- if ((ffd = open (file, mode)) < 0 && !*loopro
- && (errno != EROFS || (ffd = open (file, mode = O_RDONLY)) < 0)) {
- perror (file);
- return 1;
+ if ((ffd = open(file, mode)) < 0 && !*loopro
+ && (errno != EROFS || (ffd = open(file, mode = O_RDONLY)) < 0)) {
+ perror(file);
+ return 1;
}
- if ((fd = open (device, mode)) < 0) {
- close(ffd);
- perror (device);
- return 1;
+ if ((fd = open(device, mode)) < 0) {
+ close(ffd);
+ perror(device);
+ return 1;
}
*loopro = (mode == O_RDONLY);
memset(&loopinfo, 0, sizeof(loopinfo));
strncpy(loopinfo.lo_name, file, LO_NAME_SIZE);
- loopinfo.lo_name[LO_NAME_SIZE-1] = 0;
+ loopinfo.lo_name[LO_NAME_SIZE - 1] = 0;
loopinfo.lo_offset = offset;
@@ -1275,30 +1273,30 @@ extern int set_loop(const char *device, const char *file, int offset, int *loopr
return 0;
}
-extern char *find_unused_loop_device (void)
+extern char *find_unused_loop_device(void)
{
char dev[20];
int i, fd;
struct stat statbuf;
struct loop_info loopinfo;
- for(i = 0; i <= 7; i++) {
- sprintf(dev, "/dev/loop%d", i);
- if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
- if ((fd = open (dev, O_RDONLY)) >= 0) {
- if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == -1) {
- if (errno == ENXIO) { /* probably free */
- close (fd);
- return strdup(dev);
+ for (i = 0; i <= 7; i++) {
+ sprintf(dev, "/dev/loop%d", i);
+ if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
+ if ((fd = open(dev, O_RDONLY)) >= 0) {
+ if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == -1) {
+ if (errno == ENXIO) { /* probably free */
+ close(fd);
+ return strdup(dev);
+ }
+ }
+ close(fd);
}
- }
- close (fd);
}
- }
}
- return NULL;
+ return NULL;
}
-#endif /* BB_FEATURE_MOUNT_LOOP */
+#endif /* BB_FEATURE_MOUNT_LOOP */
/* END CODE */