From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE0CEC433E6 for ; Sat, 16 Jan 2021 17:08:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 909F722B2C for ; Sat, 16 Jan 2021 17:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726125AbhAPRHq (ORCPT ); Sat, 16 Jan 2021 12:07:46 -0500 Received: from mail-lf1-f45.google.com ([209.85.167.45]:37395 "EHLO mail-lf1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725964AbhAPRHe (ORCPT ); Sat, 16 Jan 2021 12:07:34 -0500 Received: by mail-lf1-f45.google.com with SMTP id o17so17909564lfg.4; Sat, 16 Jan 2021 09:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wa2CXXj6gWguxDo1AA/mB/lnLHXaE5PDB4GKaYCGK0Y=; b=tW5vX254OruXkfZ/pSraa6c04oiYgSfLbFzRaf69g6tKUsPs0Bx4ViPIehDTFWBXmZ 2CsDi5/gNmmebU0kSwZ56/JBoHfEzBUD8Dzy1iTUTl4aRcBWZ6992XFfGwGAv5sHR9Mo mGa6MOFkpqdOO+sC8c2VEXCrLByvg537vrw03OPQ4ouBF8Ub4F0xpBRMnBjfcjhcXobQ 5XkMYzT50TK4/99H0Q9CLC0Y3fLB0wNbjqhPMd0lG+/NaFXSIgYhrV0FcPBSamSyEKZi JeHddInik9iPwqGs8cqOkCpzG5SwDYfD7xhJ4YrFEgnbd8gA4sAcxdFAiVel6WINz2wd RbTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wa2CXXj6gWguxDo1AA/mB/lnLHXaE5PDB4GKaYCGK0Y=; b=ieROmw/D8eTRgLms78XsT8e7xaNou71xTdGa5NOA6u73rJ/DV/BYLJm6HQe/a5/pAf mBObJ3z1T5zES+BFd8soYuFKc/jVV/mXqJuKi5qWCDCMwrl4Z4JQAxPPPfthLw+dfVJD DYwcSqL+C5odizD17AifQk8vSWtL1K7ZZACsOtzzrf+KZik8ICraE67/DxNzbjsgUBbi ErDO0ZkzhTTdIqTc3GFqvpQ+7SW3nI1aie7Vsq7etFvAiOPOVHa02tY2Yo8JQSh7KP75 TQ8a0xugXHHv7b5Th40hpMOfwOmLgqhccCwIE1Jktm+RGYi3WrU/yaTrRX6jCvgOmQt6 dBew== X-Gm-Message-State: AOAM531LwynuWWEdV7NOj1C/N57GkZMhyGSkmPxqCwON+w1dIWtPm3uy mKFIzPikCTt22qYtQZGRHGUmA+Zn4mk= X-Google-Smtp-Source: ABdhPJxvvsYLlyc8CoVBJHJpBeR+QZVukpiGzksJwMXMrRvleAWgelFWcZszGNBXhTNrpdgkNNTOVg== X-Received: by 2002:a17:906:5907:: with SMTP id h7mr2624661ejq.252.1610816186517; Sat, 16 Jan 2021 08:56:26 -0800 (PST) Received: from localhost.localdomain ([31.210.181.203]) by smtp.gmail.com with ESMTPSA id zn8sm7061063ejb.39.2021.01.16.08.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Jan 2021 08:56:25 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Icenowy Zheng , Chengguang Xu , Xiao Yang , Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 2/4] src/t_immutable: factor out some helpers Date: Sat, 16 Jan 2021 18:56:17 +0200 Message-Id: <20210116165619.494265-3-amir73il@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210116165619.494265-1-amir73il@gmail.com> References: <20210116165619.494265-1-amir73il@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-unionfs@vger.kernel.org Reduce boilerplate code. define _GNU_SOURCE needed for asprintf. Signed-off-by: Amir Goldstein --- src/t_immutable.c | 221 ++++++++++++++++++++++------------------------ 1 file changed, 104 insertions(+), 117 deletions(-) diff --git a/src/t_immutable.c b/src/t_immutable.c index 86c567ed..b6a76af0 100644 --- a/src/t_immutable.c +++ b/src/t_immutable.c @@ -8,6 +8,9 @@ #define TEST_UTIME +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include #include #include @@ -1895,13 +1898,66 @@ static int check_test_area(const char *dir) return 0; } +static int create_dir(char **ppath, const char *fmt, const char *dir) +{ + const char *path; + struct stat st; + + if (asprintf(ppath, fmt, dir) == -1) { + return -1; + } + path = *ppath; + if (stat(path, &st) == 0) { + fprintf(stderr, "%s: Test area directory %s must not exist for test area creation.\n", + __progname, path); + return 1; + } + if (mkdir(path, 0777) != 0) { + fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); + return -1; + } + return 0; +} + +static int create_file(char **ppath, const char *fmt, const char *dir) +{ + const char *path; + int fd; + + if (asprintf(ppath, fmt, dir) == -1) { + return -1; + } + path = *ppath; + if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) { + fprintf(stderr, "%s: error creating file %s: %s\n", __progname, path, strerror(errno)); + return -1; + } + return fd; +} + +static int create_xattrs(int fd) +{ + if (fsetxattr(fd, "trusted.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { + if (errno != EOPNOTSUPP) { + perror("setxattr"); + return 1; + } + } + if (fsetxattr(fd, "user.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { + if (errno != EOPNOTSUPP) { + perror("setxattr"); + return 1; + } + } + return 0; +} + static int create_test_area(const char *dir) { int fd; char *path; static const char *acl_u_text = "u::rw-,g::rw-,o::rw-,u:nobody:rw-,m::rw-"; static const char *acl_u_text_d = "u::rwx,g::rwx,o::rwx,u:nobody:rwx,m::rwx"; - struct stat st; static const char *immutable = "This is an immutable file.\nIts contents cannot be altered.\n"; static const char *append_only = "This is an append-only file.\nIts contents cannot be altered.\n" "Data can only be appended.\n---\n"; @@ -1911,79 +1967,45 @@ static int create_test_area(const char *dir) return 1; } - if (stat(dir, &st) == 0) { - fprintf(stderr, "%s: Test area directory %s must not exist for test area creation.\n", - __progname, dir); - return 1; - } - umask(0000); - if (mkdir(dir, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, dir, strerror(errno)); + if (create_dir(&path, "%s", dir)) { return 1; } - - asprintf(&path, "%s/immutable.d", dir); - if (mkdir(path, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); - return 1; - } free(path); - asprintf(&path, "%s/empty-immutable.d", dir); - if (mkdir(path, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); - return 1; + if (create_dir(&path, "%s/append-only.d", dir)) { + return 1; } free(path); - asprintf(&path, "%s/append-only.d", dir); - if (mkdir(path, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); - return 1; + if (create_dir(&path, "%s/append-only.d/dir", dir)) { + return 1; } free(path); - asprintf(&path, "%s/empty-append-only.d", dir); - if (mkdir(path, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); + if ((fd = create_file(&path, "%s/append-only.d/file", dir)) == -1) { return 1; } + close(fd); free(path); - asprintf(&path, "%s/immutable.d/dir", dir); - if (mkdir(path, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); - return 1; + if (create_dir(&path, "%s/immutable.d", dir)) { + return 1; } free(path); - asprintf(&path, "%s/append-only.d/dir", dir); - if (mkdir(path, 0777) != 0) { - fprintf(stderr, "%s: error creating directory %s: %s\n", __progname, path, strerror(errno)); - return 1; + if (create_dir(&path, "%s/immutable.d/dir", dir)) { + return 1; } free(path); - asprintf(&path, "%s/append-only.d/file", dir); - if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) { - fprintf(stderr, "%s: error creating file %s: %s\n", __progname, path, strerror(errno)); + if ((fd = create_file(&path, "%s/immutable.d/file", dir)) == -1) { return 1; } close(fd); free(path); - asprintf(&path, "%s/immutable.d/file", dir); - if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) { - fprintf(stderr, "%s: error creating file %s: %s\n", __progname, path, strerror(errno)); - return 1; - } - close(fd); - free(path); - - asprintf(&path, "%s/immutable.f", dir); - if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) { - fprintf(stderr, "%s: error creating file %s: %s\n", __progname, path, strerror(errno)); + if ((fd = create_file(&path, "%s/immutable.f", dir)) == -1) { return 1; } if (write(fd, immutable, strlen(immutable)) != strlen(immutable)) { @@ -1994,17 +2016,8 @@ static int create_test_area(const char *dir) perror("acl"); return 1; } - if (fsetxattr(fd, "trusted.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } - } - if (fsetxattr(fd, "user.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } + if (create_xattrs(fd)) { + return 1; } if (fsetflag(path, fd, 1, 1)) { perror("fsetflag"); @@ -2014,8 +2027,7 @@ static int create_test_area(const char *dir) close(fd); free(path); - asprintf(&path, "%s/append-only.f", dir); - if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0666)) == -1) { + if ((fd = create_file(&path, "%s/append-only.f", dir)) == -1) { fprintf(stderr, "%s: error creating file %s: %s\n", __progname, path, strerror(errno)); return 1; } @@ -2027,17 +2039,8 @@ static int create_test_area(const char *dir) perror("acl"); return 1; } - if (fsetxattr(fd, "trusted.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } - } - if (fsetxattr(fd, "user.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } + if (create_xattrs(fd)) { + return 1; } if (fsetflag(path, fd, 1, 0)) { perror("fsetflag"); @@ -2056,17 +2059,8 @@ static int create_test_area(const char *dir) perror("acl"); return 1; } - if (fsetxattr(fd, "trusted.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } - } - if (fsetxattr(fd, "user.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } + if (create_xattrs(fd)) { + return 1; } if (fsetflag(path, fd, 1, 1)) { perror("fsetflag"); @@ -2076,7 +2070,9 @@ static int create_test_area(const char *dir) close(fd); free(path); - asprintf(&path, "%s/empty-immutable.d", dir); + if (create_dir(&path, "%s/empty-immutable.d", dir)) { + return 1; + } if ((fd = open(path, O_RDONLY)) == -1) { fprintf(stderr, "%s: error opening %s: %s\n", __progname, path, strerror(errno)); return 1; @@ -2098,17 +2094,8 @@ static int create_test_area(const char *dir) perror("acl"); return 1; } - if (fsetxattr(fd, "trusted.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } - } - if (fsetxattr(fd, "user.test", "readonly", strlen("readonly"), XATTR_CREATE) != 0) { - if (errno != EOPNOTSUPP) { - perror("setxattr"); - return 1; - } + if (create_xattrs(fd)) { + return 1; } if (fsetflag(path, fd, 1, 0)) { perror("fsetflag"); @@ -2118,7 +2105,9 @@ static int create_test_area(const char *dir) close(fd); free(path); - asprintf(&path, "%s/empty-append-only.d", dir); + if (create_dir(&path, "%s/empty-append-only.d", dir)) { + return 1; + } if ((fd = open(path, O_RDONLY)) == -1) { fprintf(stderr, "%s: error opening %s: %s\n", __progname, path, strerror(errno)); return 1; @@ -2242,6 +2231,7 @@ int main(int argc, char **argv) { int ret; int failed = 0; + int runtest = 1, create = 0, remove = 0; /* this arg parsing is gross, but who cares, its a test program */ @@ -2251,32 +2241,29 @@ int main(int argc, char **argv) } if (!strcmp(argv[1], "-c")) { - if (argc == 3) { - if ((ret = create_test_area(argv[argc-1]))) - return ret; - } else { - fprintf(stderr, "usage: t_immutable -c test_area_dir\n"); - return 1; - } + create = 1; } else if (!strcmp(argv[1], "-C")) { - if (argc == 3) { - return create_test_area(argv[argc-1]); - } else { - fprintf(stderr, "usage: t_immutable -C test_area_dir\n"); - return 1; - } + /* Prepare test area without running tests */ + create = 1; + runtest = 0; } else if (!strcmp(argv[1], "-r")) { - if (argc == 3) - return remove_test_area(argv[argc-1]); - else { - fprintf(stderr, "usage: t_immutable -r test_area_dir\n"); - return 1; - } - } else if (argc != 2) { - fprintf(stderr, "usage: t_immutable [-c|-r] test_area_dir\n"); + remove = 1; + } + + if (argc != 2 + (create | remove)) { + fprintf(stderr, "usage: t_immutable [-C|-c|-r] test_area_dir\n"); return 1; } + if (create) { + ret = create_test_area(argv[argc-1]); + if (ret || !runtest) { + return ret; + } + } else if (remove) { + return remove_test_area(argv[argc-1]); + } + umask(0000); if (check_test_area(argv[argc-1])) -- 2.25.1