Re: [LTP] [PATCH 1/2] syscalls/fchmod_03: Convert to new API

[Cyril Hrubis <chrubis@suse.cz>]

Hi!
> +/*\
> + * [Description]
>   *
> - * Test Description:
> - *  Verify that, fchmod(2) will succeed to change the mode of a file
> - *  and set the sticky bit on it if invoked by non-root (uid != 0)
> - *  process with the following constraints,
> + * Verify that, fchmod(2) will succeed to change the mode of a file
> + * and set the sticky bit on it if invoked by non-root (uid != 0)
> + * process with the following constraints,
>   *	- the process is the owner of the file.
>   *	- the effective group ID or one of the supplementary group ID's of the
>   *	  process is equal to the group ID of the file.
> - *
> - * Expected Result:
> - *  fchmod() should return value 0 on success and succeeds to change
> - *  the mode of specified file, sets sticky bit on it.
> - *
> - * Algorithm:
> - *  Setup:
> - *   Setup signal handling.
> - *   Create temporary directory.
> - *   Pause for SIGUSR1 if option specified.
> - *
> - *  Test:
> - *   Loop if the proper options are given.
> - *   Execute system call
> - *   Check return code, if system call failed (return=-1)
> - *   	Log the errno and Issue a FAIL message.
> - *   Otherwise,
> - *   	Verify the Functionality of system call
> - *      if successful,
> - *      	Issue Functionality-Pass message.
> - *      Otherwise,
> - *		Issue Functionality-Fail message.
> - *  Cleanup:
> - *   Print errno log and/or timing stats if options given
> - *   Delete the temporary directory created.
> - *
> - * Usage:  <for command-line>
> - *  fchmod03 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
> - *     where,  -c n : Run n copies concurrently.
> - *             -f   : Turn off functionality Testing.
> - *	       -i n : Execute test n times.
> - *	       -I x : Execute test for x seconds.
> - *	       -P x : Pause for x seconds between iterations.
> - *	       -t   : Turn on syscall timing.
> - *
> - * HISTORY
> - *	07/2001 Ported by Wayne Boyer
> - *
> - * RESTRICTIONS:
> - *  This test should be run by 'non-super-user' only.
> - *
>   */
> 
> -#include <stdio.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <fcntl.h>
> -#include <errno.h>
> -#include <string.h>
> -#include <signal.h>
>  #include <pwd.h>
> -
> -#include "test.h"
> -#include "safe_macros.h"
>  #include "fchmod.h"
> +#include "tst_test.h"
> 
>  int fd;				/* file descriptor for test file */
                                           ^
					   Useless comment, please
					   remove.
> -char *TCID = "fchmod03";
> -int TST_TOTAL = 1;
> -
>  char nobody_uid[] = "nobody";

These two variables should be static.

>  struct passwd *ltpuser;

This is not used outside setup() function so it should be variable local
to the test setup.

> -void setup();			/* Main setup function for the test */
> -void cleanup();			/* Main cleanup function for the test */
> -
> -int main(int ac, char **av)
> +static void verify_fchmod(void)
>  {
>  	struct stat stat_buf;	/* stat struct. */
> -	int lc;
>  	mode_t file_mode;	/* mode permissions set on testfile */

Useless comments.

> -	tst_parse_opts(ac, av, NULL, NULL);
> -
> -	setup();
> +	TST_EXP_PASS_SILENT(fchmod(fd, PERMS));
> 
> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> -
> -		tst_count = 0;
> -
> -		TEST(fchmod(fd, PERMS));
> -
> -		if (TEST_RETURN == -1) {
> -			tst_resm(TFAIL | TTERRNO, "fchmod failed");
> -			continue;
> -		}
> -		/*
> -		 * Get the file information using
> -		 * fstat(2).
> -		 */
> -		if (fstat(fd, &stat_buf) == -1)
> -			tst_brkm(TFAIL | TERRNO, cleanup,
> -				 "fstat failed");
> -		file_mode = stat_buf.st_mode;
> -
> -		/* Verify STICKY BIT set on testfile */
> -		if ((file_mode & PERMS) != PERMS)
> -			tst_resm(TFAIL, "%s: Incorrect modes 0%3o, "
> -				 "Expected 0777", TESTFILE, file_mode);
> -		else
> -			tst_resm(TPASS, "Functionality of fchmod(%d, "
> -				 "%#o) successful", fd, PERMS);
> -	}
> -
> -	cleanup();
> -	tst_exit();
> +	/*
> +	 * Get the file information using
> +	 * fstat(2).
> +	 */

Useless comment.

> +	if (fstat(fd, &stat_buf) == -1)
> +		tst_brk(TFAIL | TERRNO, "fstat failed");
> +	file_mode = stat_buf.st_mode;

SAFE_FSTAT()

> +	/* Verify STICKY BIT set on testfile */

Useless comment.

> +	if ((file_mode & PERMS) != PERMS)
> +		tst_res(TFAIL, "%s: Incorrect modes 0%3o, "
> +			 "Expected 0777", TESTFILE, file_mode);
> +	else
> +		tst_res(TPASS, "Functionality of fchmod(%d, "
> +			 "%#o) successful", fd, PERMS);
>  }
> 
>  void setup(void)

static

>  {
> -
> -	tst_sig(NOFORK, DEF_HANDLER, cleanup);
> -
> -	tst_require_root();
> -
>  	ltpuser = getpwnam(nobody_uid);
> -	if (ltpuser == NULL)
> -		tst_brkm(TBROK | TERRNO, NULL, "getpwnam failed");
> -	SAFE_SETEUID(NULL, ltpuser->pw_uid);
> -
> -	TEST_PAUSE;
> 
> -	tst_tmpdir();
> +	if (ltpuser == NULL)
> +		tst_brk(TBROK | TERRNO, "getpwnam failed");

SAFE_GETPWNAM()

> +	SAFE_SETEUID(ltpuser->pw_uid);
> 
>  	/*
>  	 * Create a test file under temporary directory with specified
> @@ -157,14 +60,18 @@ void setup(void)
>  	 * uid/gid of guest user.
>  	 */

Useless comment.

>  	if ((fd = open(TESTFILE, O_RDWR | O_CREAT, FILE_MODE)) == -1)
> -		tst_brkm(TBROK | TERRNO, cleanup, "open failed");
> +		tst_brk(TBROK | TERRNO, "open failed");

SAFE_OPEN()

>  }
> 
>  void cleanup(void)

and here as well.

>  {
>  	if (close(fd) == -1)
> -		tst_resm(TWARN | TERRNO, "close failed");
> -
> -	tst_rmdir();
> -
> +		tst_res(TWARN | TERRNO, "close failed");
>  }
> +
> +static struct tst_test test = {
> +	.test_all = verify_fchmod,
> +	.setup = setup,
> +	.needs_tmpdir = 1,
> +	.needs_root = 1,
> +};
> --
> 2.20.1
> 
> 
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp