Browse Source

do not pass 3rd param to open() which do not create files

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Denys Vlasenko 14 years ago
parent
commit
a76558a92e
2 changed files with 5 additions and 13 deletions
  1. 4 12
      libc/unistd/daemon.c
  2. 1 1
      utils/ldd.c

+ 4 - 12
libc/unistd/daemon.c

@@ -49,14 +49,6 @@
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98)
 
-/* libc_hidden_proto(open) */
-/* libc_hidden_proto(close) */
-/* libc_hidden_proto(_exit) */
-/* libc_hidden_proto(dup2) */
-/* libc_hidden_proto(setsid) */
-/* libc_hidden_proto(chdir) */
-/* libc_hidden_proto(fork) */
-
 #ifndef __ARCH_USE_MMU__
 #include <sys/syscall.h>
 #include <sched.h>
@@ -93,7 +85,7 @@ static inline pid_t fork_parent(void)
 }
 #endif
 
-int daemon( int nochdir, int noclose )
+int daemon(int nochdir, int noclose)
 {
 	int fd;
 
@@ -101,18 +93,18 @@ int daemon( int nochdir, int noclose )
 		return -1;
 
 	if (setsid() == -1)
-		return(-1);
+		return -1;
 
 	if (!nochdir)
 		chdir("/");
 
-	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
+	if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR)) != -1) {
 		dup2(fd, STDIN_FILENO);
 		dup2(fd, STDOUT_FILENO);
 		dup2(fd, STDERR_FILENO);
 		if (fd > 2)
 			close(fd);
 	}
-	return(0);
+	return 0;
 }
 #endif

+ 1 - 1
utils/ldd.c

@@ -262,7 +262,7 @@ static int map_cache(void)
 	else if (cache_addr != NULL)
 		return 0;
 
-	if (stat(LDSO_CACHE, &st) || (fd = open(LDSO_CACHE, O_RDONLY, 0)) < 0) {
+	if (stat(LDSO_CACHE, &st) || (fd = open(LDSO_CACHE, O_RDONLY)) < 0) {
 		fprintf(stderr, "ldd: can't open cache '%s'\n", LDSO_CACHE);
 		cache_addr = (caddr_t) - 1;	/* so we won't try again */
 		return -1;