[Ltp-cvs] ltp/testcases/kernel/syscalls/execve execve04.c,1.10,1.11

[Mike F. <va...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/execve
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17740

Modified Files:
	execve04.c 
Log Message:
make the -F option a bit smarter

Index: execve04.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/execve/execve04.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** execve04.c	26 Feb 2006 21:02:32 -0000	1.10
--- execve04.c	26 Feb 2006 21:15:42 -0000	1.11
***************
*** 156,165 ****
  	 * of the executable file specified with the -F option.
  	 * This way when we issue the execve() call later, we get the
! 	 * correct path.
  	 */
! 	if ((pname = getcwd(pname, 0)) == NULL) {
! 		tst_brkm(TBROK, tst_exit, "Could not get current directory");
  	}
- 	sprintf(test_name, "%s/%s", pname, fname1);
  	
  	/* make temp dir and cd to it */
--- 156,170 ----
  	 * of the executable file specified with the -F option.
  	 * This way when we issue the execve() call later, we get the
! 	 * correct path.  But only do this if user did not provide the
! 	 * full path to the executable file.
  	 */
! 	if (*fname1 != '/') {
! 		if ((pname = getcwd(pname, 0)) == NULL) {
! 			tst_brkm(TBROK, tst_exit, "Could not get current directory");
! 		}
! 		snprintf(test_name, sizeof(test_name)-1, "%s/%s", pname, fname1);
! 	} else {
! 		strncpy(test_name, fname1, sizeof(test_name)-1);
  	}
  	
  	/* make temp dir and cd to it */