change separator character from ':' to '|'

diff --git a/backup/dump_db.h b/backup/dump_db.h
index b4cb08b9a4ad4984cd5cfcec7f3741427f58448c..945850ecd957a5db7c396b9af074ab5b9f931d21 100644 (file)
--- a/backup/dump_db.h
+++ b/backup/dump_db.h
@@ -1,3 +1,7 @@
+/* $Header$ */
+
+#define SEP_CHAR       ('|')
+
 #define dump_nl(f) { if (putc('\n', f) < 0) wpunt(); }
-#define dump_sep(f) { if (putc(':', f) < 0) wpunt(); }
+#define dump_sep(f) { if (putc(SEP_CHAR, f) < 0) wpunt(); }
                           

diff --git a/backup/dump_db.qc b/backup/dump_db.qc
index d5a27b7d96d82382000acee847a78e83f8a40131..6dc214ae539513cfd67575e4ccf35270022f75eb 100644 (file)
--- a/backup/dump_db.qc
+++ b/backup/dump_db.qc
@@ -20,6 +20,7 @@ static char *rcsid_dump_db_c = "$Header$";
 #include <sys/file.h>
 #include <ctype.h>
 #include <mit-copyright.h>
+#include "dump_db.h"
 
 /* putc without the line buffer hair */
 
@@ -46,7 +47,7 @@ main(argc, argv)
 
     bzero(act, 128);
 
-    act[':']=1;
+    act[SEP_CHAR]=1;
     act['\\']=1;
     act[127]=2;
     for (i=0; i<' '; i++) act[i]=2;
@@ -172,16 +173,3 @@ char *strtrim(save)
     *t = '\0';
     return s;
 }
-
-
-
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */

diff --git a/backup/rest_db.qc b/backup/rest_db.qc
index 4ce571d321a29994207d53366401c9ed4fed3439..21bd70705b3266a2604bd861eeb88787e59ad7bf 100644 (file)
--- a/backup/rest_db.qc
+++ b/backup/rest_db.qc
@@ -17,6 +17,7 @@ static char *rcsid_rest_db_qc = "$Header$";
 #include <stdio.h>
 #include <ctype.h>
 #include <mit-copyright.h>
+#include "dump_db.h"
 
 
 /*ARGSUSED*/
@@ -109,7 +110,7 @@ int parse_int(f)
     register int c;
     register int val = 0;
     register int sign = 1;
-    while ((c = getc(f)) != EOF && c != ':' && c != '\n') {
+    while ((c = getc(f)) != EOF && c != SEP_CHAR && c != '\n') {
        if (c == '-') sign = -1;
        else if (isdigit(c)) {
            val *= 10;
@@ -127,7 +128,7 @@ void parse_str(f, buf, len)
 {
     register int c;
 
-    while ((c = getc(f)) != EOF && c != ':' && c != '\n' && len > 0) {
+    while ((c = getc(f)) != EOF && c != SEP_CHAR && c != '\n' && len > 0) {
        if (c == '\\') {
            c = getc(f);
            if (isdigit(c)) {
@@ -139,7 +140,7 @@ void parse_str(f, buf, len)
                    punt("Broken \\###");
                /* Convert to ASCII code: */
                *buf++ =  (((c-'0')<<6) + ((c1-'0')<<3) + c2-'0');
-           } else if (c == '\\' || c == ':') {
+           } else if (c == '\\' || c == SEP_CHAR) {
                *buf++ = c;
                --len;
            } else punt ("Broken '\\'");
@@ -151,9 +152,9 @@ void parse_str(f, buf, len)
     if (c == EOF)
        return;
     
-    if (c != EOF && c != ':' && c != '\n') {
+    if (c != EOF && c != SEP_CHAR && c != '\n') {
        fprintf(stderr, "Field too wide, truncated\n");
-       while ((c = getc(f)) != EOF && c != ':' && c != '\n');
+       while ((c = getc(f)) != EOF && c != SEP_CHAR && c != '\n');
        (void) ungetc(c, f);
     } else {
        *buf++ = 0;
@@ -164,7 +165,7 @@ void parse_str(f, buf, len)
 void parse_sep(f)
     FILE *f;
 {
-    if (getc(f) != ':') punt("Expected colon");
+    if (getc(f) != SEP_CHAR) punt("Expected Separator");
 }
 void parse_nl(f)
     FILE *f;
@@ -195,14 +196,3 @@ FILE *open_file(prefix, suffix)
     fprintf(stderr, "Working on %s\n", name);
     return(f);
 }
-
-/*
- * Local Variables:
- * mode: c
- * c-indent-level: 4
- * c-continued-statement-offset: 4
- * c-brace-offset: -4
- * c-argdecl-indent: 4
- * c-label-offset: -4
- * End:
- */