From: Subrata <sub...@us...> - 2009-02-26 13:19:33
|
Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/creat In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4515/ltp/testcases/kernel/syscalls/creat Modified Files: creat08.c creat09.c Log Message: Clear Trailing Whitespace. Signed-off-by: Michal Simek <mo...@mo...>. Index: creat09.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/creat/creat09.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** creat09.c 26 May 2006 06:26:38 -0000 1.2 --- creat09.c 26 Feb 2009 12:02:33 -0000 1.3 *************** *** 33,63 **** /* $Id$ */ /********************************************************** ! * * OS Test - Silicon Graphics, Inc. ! * * TEST IDENTIFIER : creat09 ! * * EXECUTED BY : anyone ! * * TEST TITLE : Basic test for creat(2) using 0700 argument. ! * * PARENT DOCUMENT : usctpl01 ! * * TEST CASE TOTAL : 1 ! * * WALL CLOCK TIME : 1 ! * * CPU TYPES : ALL ! * * AUTHOR : William Roske ! * * CO-PILOT : Dave Fenner ! * * DATE STARTED : 03/30/92 ! * * INITIAL RELEASE : UNICOS 7.0 ! * * TEST CASES ! * * 1.) creat(2) returns...(See Description) * --- 33,63 ---- /* $Id$ */ /********************************************************** ! * * OS Test - Silicon Graphics, Inc. ! * * TEST IDENTIFIER : creat09 ! * * EXECUTED BY : anyone ! * * TEST TITLE : Basic test for creat(2) using 0700 argument. ! * * PARENT DOCUMENT : usctpl01 ! * * TEST CASE TOTAL : 1 ! * * WALL CLOCK TIME : 1 ! * * CPU TYPES : ALL ! * * AUTHOR : William Roske ! * * CO-PILOT : Dave Fenner ! * * DATE STARTED : 03/30/92 ! * * INITIAL RELEASE : UNICOS 7.0 ! * * TEST CASES ! * * 1.) creat(2) returns...(See Description) * *************** *** 65,74 **** * The standard options for system call tests are accepted. * (See the parse_opts(3) man page). ! * * OUTPUT SPECIFICATIONS * * DURATION * Terminates - with frequency and infinite modes. ! * * SIGNALS * Uses SIGUSR1 to pause before test if option set. --- 65,74 ---- * The standard options for system call tests are accepted. * (See the parse_opts(3) man page). ! * * OUTPUT SPECIFICATIONS * * DURATION * Terminates - with frequency and infinite modes. ! * * SIGNALS * Uses SIGUSR1 to pause before test if option set. *************** *** 77,90 **** * RESOURCES * None ! * * ENVIRONMENTAL NEEDS * No run-time environmental needs. ! * * SPECIAL PROCEDURAL REQUIREMENTS * None ! * * INTERCASE DEPENDENCIES * None ! * * DETAILED DESCRIPTION * This is a Phase I test for the creat(2) system call. It is intended --- 77,90 ---- * RESOURCES * None ! * * ENVIRONMENTAL NEEDS * No run-time environmental needs. ! * * SPECIAL PROCEDURAL REQUIREMENTS * None ! * * INTERCASE DEPENDENCIES * None ! * * DETAILED DESCRIPTION * This is a Phase I test for the creat(2) system call. It is intended *************** *** 92,100 **** * should/will be extended when full functional tests are written for * creat(2). ! * * Setup: * Setup signal handling. * Pause for SIGUSR1 if option specified. ! * * Test: * Loop if the proper options are given. --- 92,100 ---- * should/will be extended when full functional tests are written for * creat(2). ! * * Setup: * Setup signal handling. * Pause for SIGUSR1 if option specified. ! * * Test: * Loop if the proper options are given. *************** *** 103,111 **** * Log the errno and Issue a FAIL message. * Otherwise, Issue a PASS message. ! * * Cleanup: * Print errno log and/or timing stats if options given ! * ! * *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/ --- 103,111 ---- * Log the errno and Issue a FAIL message. * Otherwise, Issue a PASS message. ! * * Cleanup: * Print errno log and/or timing stats if options given ! * ! * *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/ *************** *** 137,141 **** int lc; /* loop counter */ char *msg; /* message returned from parse_opts */ ! /*************************************************************** * parse standard options --- 137,141 ---- int lc; /* loop counter */ char *msg; /* message returned from parse_opts */ ! /*************************************************************** * parse standard options *************** *** 161,165 **** Tst_count=0; ! /* ******************************************* * Call creat(2) with 0700 argument on fname --- 161,165 ---- Tst_count=0; ! /* ******************************************* * Call creat(2) with 0700 argument on fname *************** *** 175,179 **** TEST_ERRNO, strerror(TEST_ERRNO)); } else { ! /*************************************************************** * only perform functional verification if flag set (-f not given) --- 175,179 ---- TEST_ERRNO, strerror(TEST_ERRNO)); } else { ! /*************************************************************** * only perform functional verification if flag set (-f not given) *************** *** 182,186 **** /* No Verification test, yet... */ tst_resm(TPASS, "creat(%s, 0700) returned %d", fname, TEST_RETURN); ! } } --- 182,186 ---- /* No Verification test, yet... */ tst_resm(TPASS, "creat(%s, 0700) returned %d", fname, TEST_RETURN); ! } } *************** *** 208,212 **** * setup() - performs all ONE TIME setup for this test. ***************************************************************/ ! void setup() { --- 208,212 ---- * setup() - performs all ONE TIME setup for this test. ***************************************************************/ ! void setup() { *************** *** 228,232 **** * completion or premature exit. ***************************************************************/ ! void cleanup() { --- 228,232 ---- * completion or premature exit. ***************************************************************/ ! void cleanup() { Index: creat08.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/creat/creat08.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** creat08.c 26 Feb 2009 11:43:52 -0000 1.7 --- creat08.c 26 Feb 2009 12:02:33 -0000 1.8 *************** *** 22,26 **** * creat08.c - Verifies that the group ID and setgid bit are * set correctly when a new file is created. ! * (ported from SPIE, section2/iosuite/creat5.c, * by Airong Zhang <zh...@us...>) * CALLS --- 22,26 ---- * creat08.c - Verifies that the group ID and setgid bit are * set correctly when a new file is created. ! * (ported from SPIE, section2/iosuite/creat5.c, * by Airong Zhang <zh...@us...>) * CALLS *************** *** 32,36 **** * other than that of this process and with the setgid bit set. * In each directory, create a file with and without the setgid ! * bit set in the creation modes. Verify that the modes and group * ID are correct on each of the 4 files. * As root, create a file with the setgid bit on in the --- 32,36 ---- * other than that of this process and with the setgid bit set. * In each directory, create a file with and without the setgid ! * bit set in the creation modes. Verify that the modes and group * ID are correct on each of the 4 files. * As root, create a file with the setgid bit on in the *************** *** 85,89 **** char setgid_B[MSGSIZE], nosetgid_B[MSGSIZE], root_setgid_B[MSGSIZE]; int fail_count = 0; ! gid_t group1_gid, group2_gid, mygid; uid_t save_myuid, user1_uid; pid_t mypid; --- 85,89 ---- char setgid_B[MSGSIZE], nosetgid_B[MSGSIZE], root_setgid_B[MSGSIZE]; int fail_count = 0; ! gid_t group1_gid, group2_gid, mygid; uid_t save_myuid, user1_uid; pid_t mypid; *************** *** 129,136 **** /* ! * Get the group IDs of group1 and group2. */ if ((group = getgrnam("nobody")) == NULL) { ! if ((group = getgrnam("nogroup")) == NULL) { tst_resm(TBROK, "nobody/nogroup not in /etc/group"); --- 129,136 ---- /* ! * Get the group IDs of group1 and group2. */ if ((group = getgrnam("nobody")) == NULL) { ! if ((group = getgrnam("nogroup")) == NULL) { tst_resm(TBROK, "nobody/nogroup not in /etc/group"); *************** *** 150,154 **** /* * Create a directory with group id the same as this process ! * and with no setgid bit. */ if ((ret = mkdir(DIR_A, MODE_RWX)) < 0) { --- 150,154 ---- /* * Create a directory with group id the same as this process ! * and with no setgid bit. */ if ((ret = mkdir(DIR_A, MODE_RWX)) < 0) { *************** *** 182,186 **** /* * Create a directory with group id different from that of ! * this process and with the setgid bit set. */ if ((ret = mkdir(DIR_B, MODE_RWX)) < 0) { --- 182,186 ---- /* * Create a directory with group id different from that of ! * this process and with the setgid bit set. */ if ((ret = mkdir(DIR_B, MODE_RWX)) < 0) { *************** *** 206,210 **** /* Verify modes */ if (!(buf.st_mode & S_ISGID)) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit not set", DIR_B); local_flag = FAILED; --- 206,210 ---- /* Verify modes */ if (!(buf.st_mode & S_ISGID)) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit not set", DIR_B); local_flag = FAILED; *************** *** 224,228 **** fail_count++; } ! local_flag = PASSED; --- 224,228 ---- fail_count++; } ! local_flag = PASSED; *************** *** 235,239 **** /*--------------------------------------------------------------*/ /* ! * Now become user1, group1 */ if ((ret = setgid(group1_gid)) < 0) { --- 235,239 ---- /*--------------------------------------------------------------*/ /* ! * Now become user1, group1 */ if ((ret = setgid(group1_gid)) < 0) { *************** *** 246,251 **** mygid = getgid(); ! /* ! * Create the file with setgid not set */ if ((ret = open(nosetgid_A, O_CREAT|O_EXCL|O_RDWR, MODE_RWX)) < 0) { --- 246,251 ---- mygid = getgid(); ! /* ! * Create the file with setgid not set */ if ((ret = open(nosetgid_A, O_CREAT|O_EXCL|O_RDWR, MODE_RWX)) < 0) { *************** *** 271,276 **** } ! /* ! * Create the file with setgid set */ if ((ret = open(setgid_A, O_CREAT|O_EXCL|O_RDWR, MODE_SGID)) < 0) { --- 271,276 ---- } ! /* ! * Create the file with setgid set */ if ((ret = open(setgid_A, O_CREAT|O_EXCL|O_RDWR, MODE_SGID)) < 0) { *************** *** 286,290 **** /* Verify modes */ if (!(buf.st_mode & S_ISGID)) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit not set", setgid_A); local_flag = FAILED; --- 286,290 ---- /* Verify modes */ if (!(buf.st_mode & S_ISGID)) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit not set", setgid_A); local_flag = FAILED; *************** *** 312,317 **** /* directory, group2. */ /*--------------------------------------------------------------*/ ! /* ! * Create the file with setgid not set */ if ((ret = creat(nosetgid_B, MODE_RWX)) < 0) { --- 312,317 ---- /* directory, group2. */ /*--------------------------------------------------------------*/ ! /* ! * Create the file with setgid not set */ if ((ret = creat(nosetgid_B, MODE_RWX)) < 0) { *************** *** 327,331 **** /* Verify modes */ if (buf.st_mode & S_ISGID) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit should not be set", nosetgid_B); local_flag = FAILED; --- 327,331 ---- /* Verify modes */ if (buf.st_mode & S_ISGID) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit should not be set", nosetgid_B); local_flag = FAILED; *************** *** 338,343 **** } ! /* ! * Create the file with setgid set */ if ((ret = creat(setgid_B, MODE_SGID)) < 0) { --- 338,343 ---- } ! /* ! * Create the file with setgid set */ if ((ret = creat(setgid_B, MODE_SGID)) < 0) { *************** *** 360,364 **** /* Verify modes */ if ( !(buf.st_mode & S_ISGID) ) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit should be set", setgid_B); local_flag = FAILED; --- 360,364 ---- /* Verify modes */ if ( !(buf.st_mode & S_ISGID) ) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit should be set", setgid_B); local_flag = FAILED; *************** *** 398,402 **** /* Verify modes */ if (!(buf.st_mode & S_ISGID)) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit not set", root_setgid_B); local_flag = FAILED; --- 398,402 ---- /* Verify modes */ if (!(buf.st_mode & S_ISGID)) { ! tst_resm(TFAIL, "%s: Incorrect modes, setgid bit not set", root_setgid_B); local_flag = FAILED; *************** *** 418,422 **** /*-------------------------------------------------------------- ! * Clean up any files created by test before call to anyfail. * Remove the directories. *--------------------------------------------------------------*/ --- 418,422 ---- /*-------------------------------------------------------------- ! * Clean up any files created by test before call to anyfail. * Remove the directories. *--------------------------------------------------------------*/ |