Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/device_open.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/device_open.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/libbb/device_open.c

@@ -5 +5 @@
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -11 +11 @@
 
 /* try to open up the specified device */
-int device_open(const char *device, int mode)
+int FAST_FUNC device_open(const char *device, int mode)
 {
-    int m, f, fd = -1;
+    int m, f, fd;
 
     m = mode | O_NONBLOCK;
@@ -19 +19 @@
     /* Retry up to 5 times */
     /* TODO: explain why it can't be considered insane */
-    for (f = 0; f < 5; f++)
-        if ((fd = open(device, m, 0600)) >= 0)
+    for (f = 0; f < 5; f++) {
+        fd = open(device, m, 0600);
+        if (fd >= 0)
             break;
+    }
     if (fd < 0)
         return fd;