public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/4] cmdline: Add linux command line munging tools
Date: Wed, 19 Oct 2011 18:46:09 -0400	[thread overview]
Message-ID: <201110191846.10287.vapier@gentoo.org> (raw)
In-Reply-To: <1319063459-4804-2-git-send-email-dianders@chromium.org>

On Wednesday 19 October 2011 18:30:56 Doug Anderson wrote:
> --- /dev/null
> +++ b/common/cmdline.c
>
> +/*
> + * To run unit tests in this file:
> + *   gcc -DRUN_UNITTESTS -Wall -Werror common/cmdline.c -o cmdline &&
> ./cmdline
> + */
> +#ifdef RUN_UNITTESTS

i'm not sure this part should be merged ... better to keep on the back burner 
while Simon sorts out testing framework with new sandbox arch.

> +void add_cmdline_param(char *cmdline, const char *toappend, int bufsize)

bufsize should be size_t

> +{
> +	int cmdline_len = strlen(cmdline);

cmdline_len should be size_t

> +	if (cmdline_len == 0)
> +		strncat(cmdline, toappend, bufsize-1);
> +	else {
> +		int bytes_avail = bufsize - cmdline_len;
> +
> +		if (bytes_avail <= 0) {
> +			assert(bytes_avail == 0);
> +			return;
> +		}
> +		cmdline[bufsize-1] = '\0';
> +		cmdline[cmdline_len] = ' ';
> +		strncpy(&cmdline[cmdline_len+1], toappend,
> +			bytes_avail-2);
> +	}

hmm, i feel like this should be simpler and not need that branch

	if (cmdline_len)
		cmdline[cmdline_len++] = ' ';
	if (bufsize <= cmdline_len)
		return;
	memcpy(&cmdline[cmdline_len], toappend, bufsize - cmdline_len - 1);
	cmdline[bufsize] = '\0';
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20111019/bf949527/attachment.pgp 

  reply	other threads:[~2011-10-19 22:46 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-19 22:30 [U-Boot] [PATCH 0/4] Fix fixup_silent_linux() buffer overrun Doug Anderson
2011-10-19 22:30 ` [U-Boot] [PATCH 1/4] cmdline: Add linux command line munging tools Doug Anderson
2011-10-19 22:46   ` Mike Frysinger [this message]
2011-10-20  1:23     ` Doug Anderson
2011-10-19 22:52   ` Mike Frysinger
2011-10-20  1:07     ` Doug Anderson
2011-10-20  1:37       ` Mike Frysinger
2011-10-20 14:36   ` Wolfgang Denk
2011-10-20 17:06     ` Doug Anderson
2011-10-20 17:15       ` Mike Frysinger
2011-10-20 18:23         ` Doug Anderson
2011-10-20 19:33           ` Wolfgang Denk
2011-10-20 19:03       ` Wolfgang Denk
2011-10-21  5:09         ` Doug Anderson
2011-10-19 22:30 ` [U-Boot] [PATCH 2/4] cosmetic: Fixup fixup_silent_linux() for checkpatch Doug Anderson
2011-10-20 14:38   ` Wolfgang Denk
2011-10-19 22:30 ` [U-Boot] [PATCH 3/4] bootm: Avoid 256-byte overflow in fixup_silent_linux() Doug Anderson
2011-10-19 22:51   ` Mike Frysinger
2011-10-20 14:40   ` Wolfgang Denk
2011-10-20 17:54     ` [U-Boot] [PATCH v2] " Doug Anderson
2012-01-10 22:28       ` Wolfgang Denk
2012-01-10 22:51         ` Doug Anderson
2012-01-10 23:31           ` Mike Frysinger
2012-01-10 23:30         ` Mike Frysinger
2012-01-11 18:19   ` Doug Anderson
2012-01-15  1:32     ` Mike Frysinger
2012-01-17 19:16     ` [U-Boot] [PATCH v3] " Doug Anderson
2012-01-17 19:27       ` Mike Frysinger
2012-01-17 19:33         ` Doug Anderson
2012-01-17 19:37     ` [U-Boot] [PATCH v4] " Doug Anderson
2012-01-17 19:55       ` Mike Frysinger
2013-05-22 14:59       ` [U-Boot] [U-Boot, " Tom Rini
2011-10-19 22:30 ` [U-Boot] [PATCH 4/4] bootm: Add earlyprintk to fixup_silent_linux Doug Anderson
2011-10-19 22:35   ` Mike Frysinger
2011-10-19 22:46     ` Doug Anderson
2011-10-19 23:11       ` Mike Frysinger
2011-10-20 14:42   ` Wolfgang Denk
2011-10-20 17:35     ` Doug Anderson
2011-10-20 19:26       ` Wolfgang Denk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201110191846.10287.vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox