From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by sourceware.org (Postfix) with ESMTPS id 3E43D3858D37 for ; Wed, 19 Apr 2023 16:02:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3E43D3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x234.google.com with SMTP id h2so3367672ljh.13 for ; Wed, 19 Apr 2023 09:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681920149; x=1684512149; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9NTwrh9U1J0pbzEusR1HpbFY8D/NiAkPscIbtJJw5Yc=; b=Mgiilz92+GIhEW0cEhGtbPdBfV8ON/URm7SL+w58cmbmJYJ2tZ9rt8I89hdZerBzMr Z/1VvxS1qqMeVdY+HXrwYndpT7BSkAAKojZBmoVnql68S/rkV7bcTKExz7+do74PMPvt Oy8gBszmX02pCQAFLzlsDwDMOdzA0U9nXvR/sGft8c2fgHX/Kjf8t0S5nbHZpA74SV11 2g0WSNIn13sYy3smY1h+JGLGsZ0lb0k7htiMvX7uhwedMs43GY+V3dkwUnJOEIqkqUYD /fM31hlCx1A2LG67ue/2toguGWHBL6FK83X9iuY6FAtSOufIGJTMAxEJp0uv6K1sVB9t OEtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681920149; x=1684512149; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9NTwrh9U1J0pbzEusR1HpbFY8D/NiAkPscIbtJJw5Yc=; b=brzVGgE/4fchwYITYb/P95znz9Z+mAH3xl4KVlk/t0pUw+l+4RyCNWGM8v/6dKwmjx fqEEB1FpI4rU0NSVWz1Et5r5lY4RExPg4zdvHzrdhO5yogU2smrUl7U0hGKMsiJuSrqL QRm2c87G98eBeyiXRQSGxh5NVAuEZUqirYT30Aek6JWkRfPPWepo7ok5+HVjwhkaQZtM zkU4xJ3Qoh0zjfwVKoM9apLf7Ye4DTkw5CMlvLJ5l4m+1m+CU2RwHKlw4tBz8d1MlJAw 1EneMmGfzIfoni3eR34c6hCnAhMGGXYiGJnBGxO9pFZzpw4afHOoZpyrWRPChmx7rT/y wBxQ== X-Gm-Message-State: AAQBX9dcMWUIc68gdmJR0nTgnzzwBj2JP2TTP6YdtEmMS+JsJUvxmjtr Zt2dlsUqmfRcXi/3wD9LkVG2EtN86qM= X-Google-Smtp-Source: AKy350b2kxcEhH4VgRQRf7tFZlRAZSUfx9YnnOEistObCAttbik9/4LiDhfgAxCYGMcZ3OFlu/XBPg== X-Received: by 2002:a2e:3008:0:b0:2a8:d018:c28d with SMTP id w8-20020a2e3008000000b002a8d018c28dmr2415088ljw.2.1681920148965; Wed, 19 Apr 2023 09:02:28 -0700 (PDT) Received: from surface-pro-6.. ([194.190.106.50]) by smtp.gmail.com with ESMTPSA id l1-20020a2e7001000000b002a6007383a0sm2959663ljc.135.2023.04.19.09.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 09:02:28 -0700 (PDT) From: Sergey Bugaev To: libc-alpha@sourceware.org Cc: bug-hurd@gnu.org, Samuel Thibault , Adhemerval Zanella Netto , =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= , Sergey Bugaev Subject: [RFC PATCH v2 1/7] misc: Convert daemon () to GNU coding style Date: Wed, 19 Apr 2023 19:02:01 +0300 Message-Id: <20230419160207.65988-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230419160207.65988-1-bugaevc@gmail.com> References: <20230419160207.65988-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- 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; } -- 2.40.0