ash: deal with some TODOs (mostly trivial)

[oweals/busybox.git] / libbb / device_open.c

diff --git a/libbb/device_open.c b/libbb/device_open.c
index 8e97ce6c5685ed1890f1a2ddf7b73a863e193db9..cf8bcf6467debd9508fd594a51292c5c910b228a 100644 (file)
--- a/libbb/device_open.c
+++ b/libbb/device_open.c
@@ -2,45 +2,27 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <fcntl.h>
 #include "libbb.h"
 
-
 /* try to open up the specified device */
-extern int device_open(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;
 
        /* Retry up to 5 times */
-       for (f = 0; f < 5; f++)
-               if ((fd = open(device, m, 0600)) >= 0)
+       /* TODO: explain why it can't be considered insane */
+       for (f = 0; f < 5; f++) {
+               fd = open(device, m, 0600);
+               if (fd >= 0)
                        break;
+       }
        if (fd < 0)
                return fd;
        /* Reset original flags. */
@@ -48,12 +30,3 @@ extern int device_open(char *device, int mode)
                fcntl(fd, F_SETFL, mode);
        return fd;
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/