X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=quote.h;h=c1ab3788e6d69318638142ebeffc690318a0489a;hp=ea227bb7d44b3a37990ce0d00ab4eea34a30065a;hb=162f41292167a800432fc6bbacfcd9f93a90b0c8;hpb=b71d01ef3cb9dfc41b32f360c2b10403b37c0e7a diff --git a/quote.h b/quote.h index ea227bb7..c1ab3788 100644 --- a/quote.h +++ b/quote.h @@ -1,11 +1,13 @@ #ifndef QUOTE_H #define QUOTE_H +#include #include /* Help to copy the thing properly quoted for the shell safety. - * any single quote is replaced with '\'', and the whole thing - * is enclosed in a single quote pair. + * 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: @@ -20,14 +22,26 @@ * * Note that the above examples leak memory! Remember to free result from * sq_quote() in a real application. + * + * sq_quote_buf() writes to an existing buffer of specified size; it + * will return the number of characters that would have been written + * excluding the final null regardless of the buffer size. */ extern char *sq_quote(const char *src); +extern size_t sq_quote_buf(char *dst, size_t n, const char *src); + +/* This unwraps what sq_quote() produces in place, but returns + * NULL if the input does not look like what sq_quote would have + * produced. + */ +extern char *sq_dequote(char *); extern int quote_c_style(const char *name, char *outbuf, FILE *outfp, int nodq); extern char *unquote_c_style(const char *quoted, const char **endp); -extern void write_name_quoted(const char *prefix, const char *name, - int quote, FILE *out); +extern void write_name_quoted(const char *prefix, int prefix_len, + const char *name, int quote, FILE *out); + #endif