Commit 4f5aeecd authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Remove dead quote.[ch] code 

In c6867701 ("perf tools: Remove support for command aliases") we
removed the only remaining use of a function provided by these files, so
ditch it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-mgnzqbi46gucs48d7bzfwr55@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7869e588

tools/perf/perf.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "util/env.h"

#include <subcmd/exec-cmd.h>

#include "util/config.h"

#include "util/quote.h"

#include <subcmd/run-command.h>

#include "util/parse-events.h"

#include <subcmd/parse-options.h>

tools/perf/util/Build

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ libperf-y += libstring.o 
libperf-y += bitmap.o

libperf-y += hweight.o

libperf-y += smt.o

libperf-y += quote.o

libperf-y += strbuf.o

libperf-y += string.o

libperf-y += strlist.o

tools/perf/util/quote.c

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>

#include <stdlib.h>

#include "strbuf.h"

#include "quote.h"

#include "util.h"



/* Help to copy the thing properly quoted for the shell safety.

 * any single quote is replaced with '\'', any exclamation point

 * is replaced with '\!', and the whole thing is enclosed in a

 *

 * E.g.

 *  original     sq_quote     result

 *  name     ==> name      ==> 'name'

 *  a b      ==> a b       ==> 'a b'

 *  a'b      ==> a'\''b    ==> 'a'\''b'

 *  a!b      ==> a'\!'b    ==> 'a'\!'b'

 */

static inline int need_bs_quote(char c)

{

	return (c == '\'' || c == '!');

}



static int sq_quote_buf(struct strbuf *dst, const char *src)

{

	char *to_free = NULL;

	int ret;



	if (dst->buf == src)

		to_free = strbuf_detach(dst, NULL);



	ret = strbuf_addch(dst, '\'');

	while (!ret && *src) {

		size_t len = strcspn(src, "'!");

		ret = strbuf_add(dst, src, len);

		src += len;

		while (!ret && need_bs_quote(*src))

			ret = strbuf_addf(dst, "'\\%c\'", *src++);

	}

	if (!ret)

		ret = strbuf_addch(dst, '\'');

	free(to_free);



	return ret;

}



int sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)

{

	int i, ret;



	/* Copy into destination buffer. */

	ret = strbuf_grow(dst, 255);

	for (i = 0; !ret && argv[i]; ++i) {

		ret = strbuf_addch(dst, ' ');

		if (ret)

			break;

		ret = sq_quote_buf(dst, argv[i]);

		if (maxlen && dst->len > maxlen)

			return -ENOSPC;

	}

	return ret;

}

tools/perf/util/quote.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __PERF_QUOTE_H

#define __PERF_QUOTE_H



#include <stddef.h>



/* Help to copy the thing properly quoted for the shell safety.

 * any single quote is replaced with '\'', any exclamation point

 * is replaced with '\!', and the whole thing is enclosed in a

 * single quote pair.

 *

 * For example, if you are passing the result to system() as an

 * argument:

 *

 * sprintf(cmd, "foobar %s %s", sq_quote(arg0), sq_quote(arg1))

 *

 * would be appropriate.  If the system() is going to call ssh to

 * run the command on the other side:

 *

 * sprintf(cmd, "git-diff-tree %s %s", sq_quote(arg0), sq_quote(arg1));

 * sprintf(rcmd, "ssh %s %s", sq_util/quote.host), sq_quote(cmd));

 *

 * Note that the above examples leak memory!  Remember to free result from

 * sq_quote() in a real application.

 */



struct strbuf;



int sq_quote_argv(struct strbuf *, const char **argv, size_t maxlen);



#endif /* __PERF_QUOTE_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE