From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id B48953858C53 for ; Mon, 17 Apr 2023 22:59:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B48953858C53 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-x233.google.com with SMTP id k15so10293950ljq.4 for ; Mon, 17 Apr 2023 15:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681772346; x=1684364346; 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=4Y3NDn1LcRWhRVtTDJEP7/pyWL/Z5xbvw0ME1TTbjcI=; b=fj5tEkAFK1MoUoGqvrRS8j5Jy45CfkuZe04Rv5q49GHUiQ5pG8mkS5YvhdoYcp9YED 7ZiuUXv8Te9wh2jSpjv3ClKW78y5X/mEIo9M7ewg+njGh2w4ptmsojpqujBXC7aZSjJo jTu2+xd81IirYqVCDpTmEFkMCccolSFFNen0r7LSoI9n6hUvvSfVwsto3LRy2VSzO4Ex xYJpjj1PYjDAKycKJ/GjiDz6WoAxZbma1VEqpypkb5ChcNGnxDAVhKufVgmesojUO2sF wyk3OpuFJZK0C9T8rJUBfYUGUvyawrbFRSK2ITGqujbce2NmTs1L/NrNPEWQtoy+YBJU KH6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681772346; x=1684364346; 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=4Y3NDn1LcRWhRVtTDJEP7/pyWL/Z5xbvw0ME1TTbjcI=; b=ZV7eddQ/f74TVu1Fe1fVHuO/aYrMlpwTMFzqOu/Wp2Wm+/PGGlzeZkHx7HfHi1YRMP 3lKiPSX2R31MWM3z7q9XdlXo/uagVDAXT68XqyYtY+KHB7KnkOg0uReBBWcpmRBpSpNK MTb08F2US1blLkRFcT2FF1AAJ0Kelc/Mo87E6pH5C7foFG0s3fmcxQqK+IHlSPoyDvUe 9UMMqO9jR1LDWdI7HiLg0xj1ZUgmmhYRDArv/pmfx3rgfoguZjHoLVloqNstoV38c4z7 4plXCaRqAH8t1/F1qpdJB/M+dvWpkmV4sNYTp7y/2qM54MH2jyOJc9BuWzCPCaKdTN2R zfTw== X-Gm-Message-State: AAQBX9e2jli4j+QXXl/Yy2JaCCsLT2IR+j9BnUY60bMRmJ3EYPAF/JGq aodRlU/W6BtthWh6v5nA7KYudfAKnCdiiA== X-Google-Smtp-Source: AKy350atpW4N9zJHeNOSNZPAH+jo8pLkDvqozLoSt2QFUG378F0bDfH5FoPIciVNnmOhL+8wtFqj5A== X-Received: by 2002:a2e:94d0:0:b0:2a8:b95a:c10d with SMTP id r16-20020a2e94d0000000b002a8b95ac10dmr170219ljh.8.1681772346037; Mon, 17 Apr 2023 15:59:06 -0700 (PDT) Received: from surface-pro-6.. ([2a00:1370:818c:4a57:d907:80f6:db70:646a]) by smtp.gmail.com with ESMTPSA id f7-20020a2ea0c7000000b002a8b5310642sm1463539ljm.5.2023.04.17.15.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 15:59:05 -0700 (PDT) From: Sergey Bugaev To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Samuel Thibault , Sergey Bugaev Subject: [RFC PATCH 1/5] misc: Convert daemon () to GNU coding style Date: Tue, 18 Apr 2023 01:58:53 +0300 Message-Id: <20230417225857.2006561-2-bugaevc@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417225857.2006561-1-bugaevc@gmail.com> References: <20230417225857.2006561-1-bugaevc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.8 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..61da49b7 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.39.2