Date: Sun, 14 Nov 2010 19:36:55 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r215311 - stable/8/bin/sh Message-ID: <201011141936.oAEJatBn091543@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Sun Nov 14 19:36:55 2010 New Revision: 215311 URL: http://svn.freebsd.org/changeset/base/215311 Log: MFC r213775: sh: Make DEBUG traces 64-bit clean: - Use %t to print ptrdiff_t values. - Cast a ptrdiff_t value explicitly to int for a field width specifier. While here, sort includes. Original commit by jhb. Modified: stable/8/bin/sh/expand.c stable/8/bin/sh/jobs.c Directory Properties: stable/8/bin/sh/ (props changed) Modified: stable/8/bin/sh/expand.c ============================================================================== --- stable/8/bin/sh/expand.c Sun Nov 14 18:42:39 2010 (r215310) +++ stable/8/bin/sh/expand.c Sun Nov 14 19:36:55 2010 (r215311) @@ -43,14 +43,15 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/time.h> #include <sys/stat.h> -#include <errno.h> #include <dirent.h> -#include <unistd.h> -#include <pwd.h> -#include <stdlib.h> +#include <errno.h> +#include <inttypes.h> #include <limits.h> +#include <pwd.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> +#include <unistd.h> /* * Routines to expand arguments to commands. We have to deal with @@ -491,9 +492,9 @@ expbackq(union node *cmd, int quoted, in exitstatus = waitforjob(in.jp, (int *)NULL); if (quoted == 0) recordregion(startloc, dest - stackblock(), 0); - TRACE(("evalbackq: size=%d: \"%.*s\"\n", - (dest - stackblock()) - startloc, - (dest - stackblock()) - startloc, + TRACE(("expbackq: size=%td: \"%.*s\"\n", + ((dest - stackblock()) - startloc), + (int)((dest - stackblock()) - startloc), stackblock() + startloc)); expdest = dest; INTON; Modified: stable/8/bin/sh/jobs.c ============================================================================== --- stable/8/bin/sh/jobs.c Sun Nov 14 18:42:39 2010 (r215310) +++ stable/8/bin/sh/jobs.c Sun Nov 14 19:36:55 2010 (r215311) @@ -38,18 +38,18 @@ static char sccsid[] = "@(#)jobs.c 8.5 ( #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <fcntl.h> -#include <signal.h> -#include <errno.h> -#include <paths.h> -#include <unistd.h> -#include <stdlib.h> +#include <sys/ioctl.h> #include <sys/param.h> -#include <sys/wait.h> -#include <sys/time.h> #include <sys/resource.h> +#include <sys/stddef.h> +#include <sys/time.h> +#include <sys/wait.h> +#include <errno.h> +#include <fcntl.h> #include <paths.h> -#include <sys/ioctl.h> +#include <signal.h> +#include <stdlib.h> +#include <unistd.h> #include "shell.h" #if JOBS @@ -653,7 +653,7 @@ makejob(union node *node __unused, int n jp->ps = &jp->ps0; } INTON; - TRACE(("makejob(%p, %d) returns %%%d\n", (void *)node, nprocs, + TRACE(("makejob(%p, %d) returns %%%td\n", (void *)node, nprocs, jp - jobtab + 1)); return jp; } @@ -739,7 +739,7 @@ forkshell(struct job *jp, union node *n, pid_t pid; pid_t pgrp; - TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n, + TRACE(("forkshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n, mode)); INTOFF; flushall(); @@ -868,7 +868,7 @@ waitforjob(struct job *jp, int *origstat int st; INTOFF; - TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1)); + TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1)); while (jp->state == 0) if (dowait(1, jp) == -1) dotrap(); @@ -969,7 +969,7 @@ dowait(int block, struct job *job) if (stopped) { /* stopped or done */ int state = done? JOBDONE : JOBSTOPPED; if (jp->state != state) { - TRACE(("Job %d: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state)); + TRACE(("Job %td: changing state from %d to %d\n", jp - jobtab + 1, jp->state, state)); jp->state = state; #if JOBS if (done)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011141936.oAEJatBn091543>