Author: kib
Date: Sun Mar 13 13:37:23 2011
New Revision: 219607
URL: http://svn.freebsd.org/changeset/base/219607
Log:
Fix mismerge.
Pointy hat to: kib
Modified:
stable/7/sys/kern/imgact_shell.c
Modified: stable/7/sys/kern/imgact_shell.c
==============================================================================
--- stable/7/sys/kern/imgact_shell.c Sun Mar 13 13:05:50 2011
(r219606)
+++ stable/7/sys/kern/imgact_shell.c Sun Mar 13 13:37:23 2011
(r219607)
@@ -179,7 +179,7 @@ exec_shell_imgact(imgp)
length = (imgp->args->argc == 0) ? 0 :
strlen(imgp->args->begin_argv) + 1; /* bytes to delete */
- if (offset > imgp->args->stringspace + length) {
+ if (offset > imgp->args->stringspace + length)
return (E2BIG);
bcopy(imgp->args->begin_argv + length, imgp->args->begin_argv + offset,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
