version 1.17, 2009/03/19 09:55:19 |
version 1.18, 2010/07/23 21:46:05 |
|
|
} |
} |
} |
} |
if (quote) |
if (quote) |
cvs_buf_putc(buf, '"'); |
buf_putc(buf, '"'); |
if (oldstyle) { |
if (oldstyle) { |
cvs_buf_puts(buf, repo); |
buf_puts(buf, repo); |
cvs_buf_putc(buf, ' '); |
buf_putc(buf, ' '); |
} |
} |
|
|
if (*format == '\0') |
if (*format == '\0') |
|
|
* check like this, add only uses loginfo for directories anyway |
* check like this, add only uses loginfo for directories anyway |
*/ |
*/ |
if (cvs_cmdop == CVS_OP_ADD) { |
if (cvs_cmdop == CVS_OP_ADD) { |
cvs_buf_puts(buf, "- New directory"); |
buf_puts(buf, "- New directory"); |
if (quote) |
if (quote) |
cvs_buf_putc(buf, '"'); |
buf_putc(buf, '"'); |
return (0); |
return (0); |
} |
} |
|
|
if (cvs_cmdop == CVS_OP_IMPORT) { |
if (cvs_cmdop == CVS_OP_IMPORT) { |
cvs_buf_puts(buf, "- Imported sources"); |
buf_puts(buf, "- Imported sources"); |
if (quote) |
if (quote) |
cvs_buf_putc(buf, '"'); |
buf_putc(buf, '"'); |
return (0); |
return (0); |
} |
} |
|
|
|
|
} |
} |
|
|
if (val != NULL) |
if (val != NULL) |
cvs_buf_puts(buf, val); |
buf_puts(buf, val); |
|
|
if (*(++p) != '\0') |
if (*(++p) != '\0') |
cvs_buf_putc(buf, ','); |
buf_putc(buf, ','); |
} |
} |
|
|
if (fi != NULL) |
if (fi != NULL) |
|
|
*format == 'p' || *format == 'r' || *format == 't')) |
*format == 'p' || *format == 'r' || *format == 't')) |
break; |
break; |
|
|
cvs_buf_putc(buf, ' '); |
buf_putc(buf, ' '); |
} |
} |
|
|
if (quote) |
if (quote) |
cvs_buf_putc(buf, '"'); |
buf_putc(buf, '"'); |
|
|
return 0; |
return 0; |
} |
} |
|
|
cvs_log(LP_ERR, "no such user variable ${=%s}", var); |
cvs_log(LP_ERR, "no such user variable ${=%s}", var); |
return (1); |
return (1); |
} |
} |
cvs_buf_puts(buf, val); |
buf_puts(buf, val); |
} else { |
} else { |
if (strcmp(var, "CVSEDITOR") == 0 || |
if (strcmp(var, "CVSEDITOR") == 0 || |
strcmp(var, "EDITOR") == 0 || |
strcmp(var, "EDITOR") == 0 || |
strcmp(var, "VISUAL") == 0) |
strcmp(var, "VISUAL") == 0) |
cvs_buf_puts(buf, cvs_editor); |
buf_puts(buf, cvs_editor); |
else if (strcmp(var, "CVSROOT") == 0) |
else if (strcmp(var, "CVSROOT") == 0) |
cvs_buf_puts(buf, current_cvsroot->cr_dir); |
buf_puts(buf, current_cvsroot->cr_dir); |
else if (strcmp(var, "USER") == 0) { |
else if (strcmp(var, "USER") == 0) { |
pw = getpwuid(geteuid()); |
pw = getpwuid(geteuid()); |
if (pw == NULL) { |
if (pw == NULL) { |
|
|
"caller ID"); |
"caller ID"); |
return (1); |
return (1); |
} |
} |
cvs_buf_puts(buf, pw->pw_name); |
buf_puts(buf, pw->pw_name); |
} else if (strcmp(var, "RCSBIN") == 0) { |
} else if (strcmp(var, "RCSBIN") == 0) { |
cvs_log(LP_ERR, "RCSBIN internal variable is no " |
cvs_log(LP_ERR, "RCSBIN internal variable is no " |
"longer supported"); |
"longer supported"); |
|
|
if (*p == '%') |
if (*p == '%') |
return (NULL); |
return (NULL); |
|
|
buf = cvs_buf_alloc(1024); |
buf = buf_alloc(1024); |
|
|
p = cmd; |
p = cmd; |
again: |
again: |
for (; *p != '\0'; p++) { |
for (; *p != '\0'; p++) { |
if ((pos = strcspn(p, "$%")) != 0) { |
if ((pos = strcspn(p, "$%")) != 0) { |
cvs_buf_append(buf, p, pos); |
buf_append(buf, p, pos); |
p += pos; |
p += pos; |
} |
} |
|
|
|
|
goto again; |
goto again; |
} |
} |
|
|
cvs_buf_putc(buf, '\0'); |
buf_putc(buf, '\0'); |
return (cvs_buf_release(buf)); |
return (buf_release(buf)); |
|
|
bad: |
bad: |
if (q != NULL) |
if (q != NULL) |
xfree(q); |
xfree(q); |
cvs_log(LP_NOTICE, "%s contains malformed command '%s'", file, cmd); |
cvs_log(LP_NOTICE, "%s contains malformed command '%s'", file, cmd); |
cvs_buf_free(buf); |
buf_free(buf); |
return (NULL); |
return (NULL); |
} |
} |
|
|
|
|
strerror(errno)); |
strerror(errno)); |
} |
} |
|
|
cvs_buf_puts(buf, "Update of "); |
buf_puts(buf, "Update of "); |
cvs_buf_puts(buf, current_cvsroot->cr_dir); |
buf_puts(buf, current_cvsroot->cr_dir); |
cvs_buf_putc(buf, '/'); |
buf_putc(buf, '/'); |
cvs_buf_puts(buf, repo); |
buf_puts(buf, repo); |
cvs_buf_putc(buf, '\n'); |
buf_putc(buf, '\n'); |
|
|
cvs_buf_puts(buf, "In directory "); |
buf_puts(buf, "In directory "); |
cvs_buf_puts(buf, hostname); |
buf_puts(buf, hostname); |
cvs_buf_puts(buf, ":"); |
buf_puts(buf, ":"); |
cvs_buf_puts(buf, dirname(pwd)); |
buf_puts(buf, dirname(pwd)); |
cvs_buf_putc(buf, '/'); |
buf_putc(buf, '/'); |
cvs_buf_puts(buf, repo); |
buf_puts(buf, repo); |
cvs_buf_putc(buf, '\n'); |
buf_putc(buf, '\n'); |
cvs_buf_putc(buf, '\n'); |
buf_putc(buf, '\n'); |
} |
} |
|
|