mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move add_to_string to "quote.c" and make it extern.

Browse Source 
So that this function may be used in places other than "rsh.c".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Christian Couder 2006-09-11 06:59:22 +02:00 committed by Junio C Hamano
parent 8be683520e
commit 86257aa324
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
quote.c
View File

@ -106,6 +106,35 @@ char *sq_quote_argv(const char** argv, int count)
return buf;
}
/*
* Append a string to a string buffer, with or without shell quoting.
* Return true if the buffer overflowed.
*/
int add_to_string(char **ptrp, int *sizep, const char *str, int quote)
{
char *p = *ptrp;
int size = *sizep;
int oc;
int err = 0;
if (quote)
oc = sq_quote_buf(p, size, str);
else {
oc = strlen(str);
memcpy(p, str, (size <= oc) ? size - 1 : oc);
}
if (size <= oc) {
err = 1;
oc = size - 1;
}
*ptrp += oc;
**ptrp = '\0';
*sizep -= oc;
return err;
}
char *sq_dequote(char *arg)
{
char *dst = arg;

6
quote.h
View File

@ -33,6 +33,12 @@ extern void sq_quote_print(FILE *stream, const char *src);
extern size_t sq_quote_buf(char *dst, size_t n, const char *src);
extern char *sq_quote_argv(const char** argv, int count);
/*
* Append a string to a string buffer, with or without shell quoting.
* Return true if the buffer overflowed.
*/
extern int add_to_string(char **ptrp, int *sizep, const char *str, int quote);
/* This unwraps what sq_quote() produces in place, but returns
* NULL if the input does not look like what sq_quote would have
* produced.

31
rsh.c
View File

@ -8,36 +8,7 @@
#define COMMAND_SIZE 4096
/*
* Append a string to a string buffer, with or without shell quoting.
* Return true if the buffer overflowed.
*/
static int add_to_string(char **ptrp, int *sizep, const char *str, int quote)
{
char *p = *ptrp;
int size = *sizep;
int oc;
int err = 0;
if ( quote ) {
oc = sq_quote_buf(p, size, str);
} else {
oc = strlen(str);
memcpy(p, str, (oc >= size) ? size-1 : oc);
}
if ( oc >= size ) {
err = 1;
oc = size-1;
}
*ptrp += oc;
**ptrp = '\0';
*sizep -= oc;
return err;
}
int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
char *url, int rmt_argc, char **rmt_argv)
{
char *host;