diff mbox series

[RFC,v2,1/7] misc: Convert daemon () to GNU coding style

Message ID 20230419160207.65988-2-bugaevc@gmail.com
State Committed, archived
Headers
Series O_IGNORE_CTTY everywhere & misc fixes |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Sergey Bugaev April 19, 2023, 4:02 p.m. UTC 
  This is nicer, and is going to be required for the following changes
to reasonably stay within the 79 column limit.

No functional change.

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
 misc/daemon.c | 88 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 49 insertions(+), 39 deletions(-)

Comments

Adhemerval Zanella Netto April 21, 2023, 12:18 p.m. UTC | #1 
On 19/04/23 13:02, Sergey Bugaev wrote:
> This is nicer, and is going to be required for the following changes
> to reasonably stay within the 79 column limit.
> 
> No functional change.
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>

LGTM, thanks.  I can be installed independently.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  misc/daemon.c | 88 ++++++++++++++++++++++++++++-----------------------
>  1 file changed, 49 insertions(+), 39 deletions(-)
> 
> diff --git a/misc/daemon.c b/misc/daemon.c
> index 3c73ac2a..14577e40 100644
> --- a/misc/daemon.c
> +++ b/misc/daemon.c
> @@ -43,50 +43,60 @@ static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
>  int
>  daemon (int nochdir, int noclose)
>  {
> -	int fd;
> +  int fd;
>  
> -	switch (__fork()) {
> -	case -1:
> -		return (-1);
> -	case 0:
> -		break;
> -	default:
> -		_exit(0);
> -	}
> +  switch (__fork ())
> +    {
> +    case -1:
> +      return -1;
>  
> -	if (__setsid() == -1)
> -		return (-1);
> +    case 0:
> +      break;
>  
> -	if (!nochdir)
> -		(void)__chdir("/");
> +    default:
> +      _exit (0);
> +    }
>  
> -	if (!noclose) {
> -		struct __stat64_t64 st;
> +  if (__setsid () == -1)
> +    return -1;
>  
> -		if ((fd = __open_nocancel(_PATH_DEVNULL, O_RDWR, 0)) != -1
> -		    && __glibc_likely (__fstat64_time64 (fd, &st) == 0)) {
> -			if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
> +  if (!nochdir)
> +    (void) __chdir ("/");
> +
> +  if (!noclose)
> +    {
> +      struct __stat64_t64 st;
> +
> +      fd = __open_nocancel (_PATH_DEVNULL, O_RDWR, 0);
> +      if (fd != -1 && __glibc_likely (__fstat64_time64 (fd, &st) == 0))
> +        {
> +          if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
>  #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
> -			    && (st.st_rdev
> -				== makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR))
> +              && (st.st_rdev == makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR))
>  #endif
> -			    ) {
> -				(void)__dup2(fd, STDIN_FILENO);
> -				(void)__dup2(fd, STDOUT_FILENO);
> -				(void)__dup2(fd, STDERR_FILENO);
> -				if (fd > 2)
> -					(void)__close (fd);
> -			} else {
> -				/* We must set an errno value since no
> -				   function call actually failed.  */
> -				__close_nocancel_nostatus (fd);
> -				__set_errno (ENODEV);
> -				return -1;
> -			}
> -		} else {
> -			__close_nocancel_nostatus (fd);
> -			return -1;
> -		}
> -	}
> -	return (0);
> +             )
> +            {
> +              (void) __dup2 (fd, STDIN_FILENO);
> +              (void) __dup2 (fd, STDOUT_FILENO);
> +              (void) __dup2 (fd, STDERR_FILENO);
> +              if (fd > 2)
> +                (void) __close (fd);
> +            }
> +          else
> +            {
> +              /* We must set an errno value since no function call
> +                 actually failed.  */
> +              __close_nocancel_nostatus (fd);
> +              __set_errno (ENODEV);
> +              return -1;
> +            }
> +        }
> +      else
> +        {
> +          __close_nocancel_nostatus (fd);
> +          return -1;
> +        }
> +    }
> +
> +  return 0;
>  }
Samuel Thibault April 22, 2023, 11:47 a.m. UTC | #2 
Applied, thanks!

Adhemerval Zanella Netto, le ven. 21 avril 2023 09:18:19 -0300, a ecrit:
> 
> 
> On 19/04/23 13:02, Sergey Bugaev wrote:
> > This is nicer, and is going to be required for the following changes
> > to reasonably stay within the 79 column limit.
> > 
> > No functional change.
> > 
> > Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> 
> LGTM, thanks.  I can be installed independently.
> 
> Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
> 
> > ---
> >  misc/daemon.c | 88 ++++++++++++++++++++++++++++-----------------------
> >  1 file changed, 49 insertions(+), 39 deletions(-)
> > 
> > diff --git a/misc/daemon.c b/misc/daemon.c
> > index 3c73ac2a..14577e40 100644
> > --- a/misc/daemon.c
> > +++ b/misc/daemon.c
> > @@ -43,50 +43,60 @@ static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
> >  int
> >  daemon (int nochdir, int noclose)
> >  {
> > -	int fd;
> > +  int fd;
> >  
> > -	switch (__fork()) {
> > -	case -1:
> > -		return (-1);
> > -	case 0:
> > -		break;
> > -	default:
> > -		_exit(0);
> > -	}
> > +  switch (__fork ())
> > +    {
> > +    case -1:
> > +      return -1;
> >  
> > -	if (__setsid() == -1)
> > -		return (-1);
> > +    case 0:
> > +      break;
> >  
> > -	if (!nochdir)
> > -		(void)__chdir("/");
> > +    default:
> > +      _exit (0);
> > +    }
> >  
> > -	if (!noclose) {
> > -		struct __stat64_t64 st;
> > +  if (__setsid () == -1)
> > +    return -1;
> >  
> > -		if ((fd = __open_nocancel(_PATH_DEVNULL, O_RDWR, 0)) != -1
> > -		    && __glibc_likely (__fstat64_time64 (fd, &st) == 0)) {
> > -			if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
> > +  if (!nochdir)
> > +    (void) __chdir ("/");
> > +
> > +  if (!noclose)
> > +    {
> > +      struct __stat64_t64 st;
> > +
> > +      fd = __open_nocancel (_PATH_DEVNULL, O_RDWR, 0);
> > +      if (fd != -1 && __glibc_likely (__fstat64_time64 (fd, &st) == 0))
> > +        {
> > +          if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
> >  #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
> > -			    && (st.st_rdev
> > -				== makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR))
> > +              && (st.st_rdev == makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR))
> >  #endif
> > -			    ) {
> > -				(void)__dup2(fd, STDIN_FILENO);
> > -				(void)__dup2(fd, STDOUT_FILENO);
> > -				(void)__dup2(fd, STDERR_FILENO);
> > -				if (fd > 2)
> > -					(void)__close (fd);
> > -			} else {
> > -				/* We must set an errno value since no
> > -				   function call actually failed.  */
> > -				__close_nocancel_nostatus (fd);
> > -				__set_errno (ENODEV);
> > -				return -1;
> > -			}
> > -		} else {
> > -			__close_nocancel_nostatus (fd);
> > -			return -1;
> > -		}
> > -	}
> > -	return (0);
> > +             )
> > +            {
> > +              (void) __dup2 (fd, STDIN_FILENO);
> > +              (void) __dup2 (fd, STDOUT_FILENO);
> > +              (void) __dup2 (fd, STDERR_FILENO);
> > +              if (fd > 2)
> > +                (void) __close (fd);
> > +            }
> > +          else
> > +            {
> > +              /* We must set an errno value since no function call
> > +                 actually failed.  */
> > +              __close_nocancel_nostatus (fd);
> > +              __set_errno (ENODEV);
> > +              return -1;
> > +            }
> > +        }
> > +      else
> > +        {
> > +          __close_nocancel_nostatus (fd);
> > +          return -1;
> > +        }
> > +    }
> > +
> > +  return 0;
> >  }
>
diff mbox series

Patch

diff --git a/misc/daemon.c b/misc/daemon.c
index 3c73ac2a..14577e40 100644
--- a/misc/daemon.c
+++ b/misc/daemon.c
@@ -43,50 +43,60 @@  static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
 int
 daemon (int nochdir, int noclose)
 {
-	int fd;
+  int fd;
 
-	switch (__fork()) {
-	case -1:
-		return (-1);
-	case 0:
-		break;
-	default:
-		_exit(0);
-	}
+  switch (__fork ())
+    {
+    case -1:
+      return -1;
 
-	if (__setsid() == -1)
-		return (-1);
+    case 0:
+      break;
 
-	if (!nochdir)
-		(void)__chdir("/");
+    default:
+      _exit (0);
+    }
 
-	if (!noclose) {
-		struct __stat64_t64 st;
+  if (__setsid () == -1)
+    return -1;
 
-		if ((fd = __open_nocancel(_PATH_DEVNULL, O_RDWR, 0)) != -1
-		    && __glibc_likely (__fstat64_time64 (fd, &st) == 0)) {
-			if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
+  if (!nochdir)
+    (void) __chdir ("/");
+
+  if (!noclose)
+    {
+      struct __stat64_t64 st;
+
+      fd = __open_nocancel (_PATH_DEVNULL, O_RDWR, 0);
+      if (fd != -1 && __glibc_likely (__fstat64_time64 (fd, &st) == 0))
+        {
+          if (__builtin_expect (S_ISCHR (st.st_mode), 1) != 0
 #if defined DEV_NULL_MAJOR && defined DEV_NULL_MINOR
-			    && (st.st_rdev
-				== makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR))
+              && (st.st_rdev == makedev (DEV_NULL_MAJOR, DEV_NULL_MINOR))
 #endif
-			    ) {
-				(void)__dup2(fd, STDIN_FILENO);
-				(void)__dup2(fd, STDOUT_FILENO);
-				(void)__dup2(fd, STDERR_FILENO);
-				if (fd > 2)
-					(void)__close (fd);
-			} else {
-				/* We must set an errno value since no
-				   function call actually failed.  */
-				__close_nocancel_nostatus (fd);
-				__set_errno (ENODEV);
-				return -1;
-			}
-		} else {
-			__close_nocancel_nostatus (fd);
-			return -1;
-		}
-	}
-	return (0);
+             )
+            {
+              (void) __dup2 (fd, STDIN_FILENO);
+              (void) __dup2 (fd, STDOUT_FILENO);
+              (void) __dup2 (fd, STDERR_FILENO);
+              if (fd > 2)
+                (void) __close (fd);
+            }
+          else
+            {
+              /* We must set an errno value since no function call
+                 actually failed.  */
+              __close_nocancel_nostatus (fd);
+              __set_errno (ENODEV);
+              return -1;
+            }
+        }
+      else
+        {
+          __close_nocancel_nostatus (fd);
+          return -1;
+        }
+    }
+
+  return 0;
 }