Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added str_escape from Emiliano Gabrielli

Browse Source 
SVN revision: 1338
This commit is contained in:
Stefan Ritt 2005-04-29 20:26:12 +00:00
parent f860ca6d9d
commit 5541e9716c
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.640 2005/04/29 20:26:12 ritt
Added str_escape from Emiliano Gabrielli
Revision 1.639 2005/04/29 20:04:51 ritt Revision 1.639 2005/04/29 20:04:51 ritt
Implemented 'case sensitive search' flag Implemented 'case sensitive search' flag
@ -2041,6 +2044,27 @@ Do the same including '/' characters
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
void str_escape(char *ps, int size)
/********************************************************************\
Encode the given string in-place by adding \\ escapes for `$"\
\********************************************************************/
{
unsigned char *pd, *p, str[NAME_LENGTH];
pd = str;
p = ps;
while (*p && (int) pd < (int) str + 250) {
if (strchr("'$\"\\", *p)) {
*pd++ = '\\';
*pd++ = *p++;
} else {
*pd++ = *p++;
}
}
*pd = '\0';
strlcpy(ps, str, size);
}
void btou(char *str) void btou(char *str)
/* convert all blanks to underscores in a string */ /* convert all blanks to underscores in a string */
{ {
@ -17161,7 +17185,7 @@ int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LE
{ {
int i; int i;
char slist[MAX_N_ATTR + 10][NAME_LENGTH], svalue[MAX_N_ATTR + 10][NAME_LENGTH]; char slist[MAX_N_ATTR + 10][NAME_LENGTH], svalue[MAX_N_ATTR + 10][NAME_LENGTH];
char shell_cmd[10000], tail[1000], str[80], *p; char shell_cmd[10000], tail[1000], str[NAME_LENGTH], *p;
if (!enable_execute) { if (!enable_execute) {
eprintf("Shell execution not enabled via -x flag.\n"); eprintf("Shell execution not enabled via -x flag.\n");
@ -17183,9 +17207,12 @@ int execute_shell(LOGBOOK * lbs, int message_id, char attrib[MAX_N_ATTR][NAME_LE
for (i = 0; i < MAX_ATTACHMENTS; i++) for (i = 0; i < MAX_ATTACHMENTS; i++)
if (att_file[i][0] && if (att_file[i][0] &&
strlen(shell_cmd) + strlen(lbs->data_dir) + strlen(att_file[i]) < sizeof(shell_cmd) + 1) { strlen(shell_cmd) + strlen(lbs->data_dir) + strlen(att_file[i]) < sizeof(shell_cmd) + 1) {
strcpy(p, lbs->data_dir); strcpy(p, "\"");
strcat(p, att_file[i]); strcat(p, lbs->data_dir);
strcat(p, " "); strcpy(str, att_file[i]);
str_escape(str, sizeof(str));
strcat(p, str);
strcat(p, "\" ");
p += strlen(p); p += strlen(p);
} }
strlcat(shell_cmd, tail, sizeof(shell_cmd)); strlcat(shell_cmd, tail, sizeof(shell_cmd));