*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
}
}
+/* Convert spaces to non-space character.
+ * This makes scanf of fields containing spaces easier.
+ */
+void
+bash_spaces(POOL_MEM &pm)
+{
+ char *str = pm.c_str();
+ while (*str) {
+ if (*str == ' ')
+ *str = 0x1;
+ str++;
+ }
+}
+
+
/* Convert non-space characters (0x1) back into spaces */
void
unbash_spaces(char *str)
}
}
+/* Convert non-space characters (0x1) back into spaces */
+void
+unbash_spaces(POOL_MEM &pm)
+{
+ char *str = pm.c_str();
+ while (*str) {
+ if (*str == 0x1)
+ *str = ' ';
+ str++;
+ }
+}
+
+#ifdef WIN32
+extern long _timezone;
+extern int _daylight;
+extern long _dstbias;
+extern "C" void __tzset(void);
+extern "C" int _isindst(struct tm *);
+#endif
char *encode_time(time_t time, char *buf)
{
struct tm tm;
int n = 0;
+#ifdef WIN32
+ /*
+ * Gross kludge to avoid a seg fault in Microsoft's CRT localtime_r(),
+ * which incorrectly references a NULL returned from gmtime() if
+ * the time (adjusted for the current timezone) is invalid.
+ * This could happen if you have a bad date/time, or perhaps if you
+ * moved a file from one timezone to another?
+ */
+ struct tm *gtm;
+ time_t gtime;
+ __tzset();
+ gtime = time - _timezone;
+ if (!(gtm = gmtime(>ime))) {
+ return buf;
+ }
+ if (_daylight && _isindst(gtm)) {
+ gtime -= _dstbias;
+ if (!gmtime(>ime)) {
+ return buf;
+ }
+ }
+#endif
if (localtime_r(&time, &tm)) {
n = sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d",
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
return buf+n;
}
-/*
- * Concatenate a string (str) onto a pool memory buffer pm
- */
-int pm_strcat(POOLMEM **pm, char *str)
-{
- int pmlen = strlen(*pm);
- int len = strlen(str) + 1;
-
- *pm = check_pool_memory_size(*pm, pmlen + len);
- memcpy(*pm+pmlen, str, len);
- return pmlen + len - 1;
-}
-
-
-/*
- * Copy a string (str) into a pool memory buffer pm
- */
-int pm_strcpy(POOLMEM **pm, char *str)
-{
- int len = strlen(str) + 1;
-
- *pm = check_pool_memory_size(*pm, len);
- memcpy(*pm, str, len);
- return len - 1;
-}
/*
*/
void jobstatus_to_ascii(int JobStatus, char *msg, int maxlen)
{
- char *termstat;
+ const char *jobstat;
char buf[100];
switch (JobStatus) {
- case JS_Terminated:
- termstat = _("OK");
- break;
- case JS_FatalError:
- case JS_ErrorTerminated:
- termstat = _("Error");
- break;
- case JS_Error:
- termstat = _("Non-fatal error");
- break;
- case JS_Canceled:
- termstat = _("Canceled");
- break;
- case JS_Differences:
- termstat = _("Verify differences");
- break;
- default:
- if (JobStatus == 0) {
- buf[0] = 0;
- } else {
- bsnprintf(buf, sizeof(buf), _("Unknown Job termination status=%d"), JobStatus);
- }
- termstat = buf;
- break;
+ case JS_Created:
+ jobstat = _("Created");
+ break;
+ case JS_Running:
+ jobstat = _("Running");
+ break;
+ case JS_Blocked:
+ jobstat = _("Blocked");
+ break;
+ case JS_Terminated:
+ jobstat = _("OK");
+ break;
+ case JS_FatalError:
+ case JS_ErrorTerminated:
+ jobstat = _("Error");
+ break;
+ case JS_Error:
+ jobstat = _("Non-fatal error");
+ break;
+ case JS_Canceled:
+ jobstat = _("Canceled");
+ break;
+ case JS_Differences:
+ jobstat = _("Verify differences");
+ break;
+ case JS_WaitFD:
+ jobstat = _("Waiting on FD");
+ break;
+ case JS_WaitSD:
+ jobstat = _("Wait on SD");
+ break;
+ case JS_WaitMedia:
+ jobstat = _("Wait for new Volume");
+ break;
+ case JS_WaitMount:
+ jobstat = _("Waiting for mount");
+ break;
+ case JS_WaitStoreRes:
+ jobstat = _("Waiting for Storage resource");
+ break;
+ case JS_WaitJobRes:
+ jobstat = _("Waiting for Job resource");
+ break;
+ case JS_WaitClientRes:
+ jobstat = _("Waiting for Client resource");
+ break;
+ case JS_WaitMaxJobs:
+ jobstat = _("Waiting on Max Jobs");
+ break;
+ case JS_WaitStartTime:
+ jobstat = _("Waiting for Start Time");
+ break;
+ case JS_WaitPriority:
+ jobstat = _("Waiting on Priority");
+ break;
+
+ default:
+ if (JobStatus == 0) {
+ buf[0] = 0;
+ } else {
+ bsnprintf(buf, sizeof(buf), _("Unknown Job termination status=%d"), JobStatus);
+ }
+ jobstat = buf;
+ break;
}
- bstrncpy(msg, termstat, maxlen);
+ bstrncpy(msg, jobstat, maxlen);
}
/*
* Convert Job Termination Status into a string
*/
-char *job_status_to_str(int stat)
+const char *job_status_to_str(int stat)
{
- char *str;
+ const char *str;
switch (stat) {
case JS_Terminated:
/*
* Convert Job Type into a string
*/
-char *job_type_to_str(int type)
+const char *job_type_to_str(int type)
{
- char *str;
+ const char *str;
switch (type) {
case JT_BACKUP:
/*
* Convert Job Level into a string
*/
-char *job_level_to_str(int level)
+const char *job_level_to_str(int level)
{
- char *str;
+ const char *str;
switch (level) {
case L_BASE:
case L_VERIFY_VOLUME_TO_CATALOG:
str = _("Verify Volume to Catalog");
break;
+ case L_VERIFY_DISK_TO_CATALOG:
+ str = _("Verify Disk to Catalog");
+ break;
case L_VERIFY_DATA:
str = _("Verify Data");
break;
+ case L_NONE:
+ str = " ";
+ break;
default:
str = _("Unknown Job Level");
break;
POOLMEM *cmd;
BPIPE *bpipe;
char line[MAXSTRING];
- char *shellcmd;
+ const char *shellcmd;
/* Check if any meta characters are present */
len = strlen(meta);
pm_strcat(&cmd, name);
pm_strcat(&cmd, "\"");
Dmsg1(400, "Send: %s\n", cmd);
- bpipe = open_bpipe(cmd, 0, "r");
- *line = 0;
- fgets(line, sizeof(line), bpipe->rfd);
- strip_trailing_junk(line);
- stat = close_bpipe(bpipe);
- Dmsg2(400, "stat=%d got: %s\n", stat, line);
+ if ((bpipe = open_bpipe(cmd, 0, "r"))) {
+ *line = 0;
+ fgets(line, sizeof(line), bpipe->rfd);
+ strip_trailing_junk(line);
+ stat = close_bpipe(bpipe);
+ Dmsg2(400, "stat=%d got: %s\n", stat, line);
+ } else {
+ stat = 1; /* error */
+ }
free_pool_memory(cmd);
if (stat == 0) {
bstrncpy(name, line, name_len);
s[0] = 0;
if (seed != NULL) {
- strcat(s, seed);
+ bstrncat(s, seed, sizeof(s));
}
/* The following creates a seed for the session key generator
available on your machine, replace it with something
equivalent or, if you like, just delete it. */
- sprintf(s + strlen(s), "%lu", (unsigned long) getpid());
- sprintf(s + strlen(s), "%lu", (unsigned long) getppid());
+ sprintf(s + strlen(s), "%lu", (unsigned long)getpid());
+ sprintf(s + strlen(s), "%lu", (unsigned long)getppid());
getcwd(s + strlen(s), 256);
- sprintf(s + strlen(s), "%lu", (unsigned long) clock());
- sprintf(s + strlen(s), "%lu", (unsigned long) time(NULL));
+ sprintf(s + strlen(s), "%lu", (unsigned long)clock());
+ sprintf(s + strlen(s), "%lu", (unsigned long)time(NULL));
#ifdef Solaris
sysinfo(SI_HW_SERIAL,s + strlen(s), 12);
#endif
MD5Init(&md5c);
MD5Update(&md5c, (unsigned char *)s, strlen(s));
MD5Final(md5key, &md5c);
- sprintf(s + strlen(s), "%lu", (unsigned long) ((time(NULL) + 65121) ^ 0x375F));
+ sprintf(s + strlen(s), "%lu", (unsigned long)((time(NULL) + 65121) ^ 0x375F));
MD5Init(&md5c);
MD5Update(&md5c, (unsigned char *)s, strlen(s));
MD5Final(md5key1, &md5c);
#define nextrand (md5key[j] ^ md5key1[j])
if (mode) {
for (j = k = 0; j < 16; j++) {
- unsigned char rb = nextrand;
+ unsigned char rb = nextrand;
#define Rad16(x) ((x) + 'A')
- key[k++] = Rad16((rb >> 4) & 0xF);
- key[k++] = Rad16(rb & 0xF);
+ key[k++] = Rad16((rb >> 4) & 0xF);
+ key[k++] = Rad16(rb & 0xF);
#undef Rad16
- if (j & 1) {
- key[k++] = '-';
- }
+ if (j & 1) {
+ key[k++] = '-';
+ }
}
key[--k] = 0;
} else {
for (j = 0; j < 16; j++) {
- key[j] = nextrand;
+ key[j] = nextrand;
}
}
}
* %n = Unadorned Job name
* %t = Job type (Backup, ...)
* %r = Recipients
+ * %v = Volume name
*
* omsg = edited output message
* imsg = input string containing edit codes (%x)
* to = recepients list
*
*/
-POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, char *to)
+POOLMEM *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to)
{
- char *p, *str;
+ char *p, *q;
+ const char *str;
char add[20];
char name[MAX_NAME_LENGTH];
+ int i;
*omsg = 0;
Dmsg1(200, "edit_job_codes: %s\n", imsg);
case 'n':
bstrncpy(name, jcr->Job, sizeof(name));
/* There are three periods after the Job name */
- for (int i=0; i<3; i++) {
- if ((str=strrchr(name, '.')) != NULL) {
- *str = 0;
+ for (i=0; i<3; i++) {
+ if ((q=strrchr(name, '.')) != NULL) {
+ *q = 0;
}
}
str = name;
case 't':
str = job_type_to_str(jcr->JobType);
break;
+ case 'v':
+ if (jcr->VolumeName && jcr->VolumeName[0]) {
+ str = jcr->VolumeName;
+ } else {
+ str = "";
+ }
+ break;
default:
add[0] = '%';
add[1] = *p;
projects / bacula / bacula / blobdiff