/*
dtaus.c - Belegloser Datenträgeraustausch mit einer Bank
- Copyright (c) 1996,8,2001 Martin Schulze <joey@infodrom.org>
+ Copyright (c) 1996,8,2001,2,3 Martin Schulze <joey@infodrom.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <time.h>
#include <malloc.h>
-/* #define DEFAULT_EURO */
+#define DEFAULT_EURO
#ifndef DEFAULT_EURO
int use_euro = 0;
+#else
+int use_euro = 1;
#endif
/*
{"BLZ", 7, 8, REQ},
{"Referenz", 70, 10, OPT},
{"Datum", 50, 6, IGN},
+ {"Ausfuehrung", 95, 8, OPT},
+ {"Currency", 127, 1, OPT},
{"Euro", 127, 1, OPT},
+ {"DM", 127, 1, OPT},
{NULL, 0, 0}
};
#define A_BLZ 3
#define A_REF 4
#define A_DATE 5
-#define A_EURO 6
-#define A_LEN 7
+#define A_TODO 6
+#define A_CURR 7
+#define A_EURO 8
+#define A_DM 9
+#define A_LEN 10
+#define A_LOOP 7
dtaus_record recC[] = {
{"Name", 93, 27, REQ},
{"myName", 128, 27, OPT},
{"myKonto", 69, 10, OPT},
{"myBLZ", 61, 8, OPT},
- {"Euro", 182, 1, IGN},
{"Text", 187, 29, OPT},
{"Extension", 216, 29, OPT},
+ {"Currency", 182, 1, IGN},
#ifndef DEFAULT_EURO
{"Betrag-Euro", 79, 11, IGN},
+#else
+ {"Betrag-DM", 50, 11, IGN},
#endif
{NULL, 0, 0}
};
#define C_MYNAM 6
#define C_MYKTO 7
#define C_MYBLZ 8
-#define C_EURO 9
-#define C_TEXT 10
-#define C_EXT 11
+#define C_TEXT 9
+#define C_EXT 10
+#define C_EURO 11
#ifndef DEFAULT_EURO
#define C_EUR 12
-#define C_LEN 13
#else
-#define C_LEN 12
+#define C_DM 12
#endif
+#define C_LEN 13
+#define C_LOOP 11
#define MAX_TEXT 14
{"BLZs", 47, 17, IGN},
#ifndef DEFAULT_EURO
{"Summe-Euro", 64, 13, IGN},
+#else
+ {"Summe-DM", 17, 13, IGN},
#endif
{NULL, 0, 0}
};
#define E_BLZ 3
#ifndef DEFAULT_EURO
#define E_EUR 4
+#else
+#define E_DM 4
#endif
+#define E_LEN 5
/*
* Second: Some low level routines
size_t dtaus_nextrec (void **buf, FILE *f)
{
- bzero (buf, 128);
+ memset (buf, 0, 128);
return fread(buf, 128, 1, f);
}
char dtaus_char (void *buf, unsigned int pos)
{
static char res;
- char *bufp = buf;
+ char *bufp = (char *)buf;
bufp+=pos;
memcpy(&res, bufp, 1);
static char res[20];
char *cp;
- strcpy(res, s);
+ strncpy(res, s, sizeof(res)-1);
+ res[sizeof(res)-1] = 0;
for (cp=res; *cp&&!(*cp == ',')&&!(*cp == '.');cp++);
- *(cp++) = *(cp+1);
- *(cp++) = *(cp+1);
+
+ if ((cp-res) >= (sizeof(res)-3)) {
+ /* Bail out, since the number is too large, shouldn't be possible though. */
+ fprintf (stderr, "Value %s too large.\n", res);
+ exit (1);
+ }
+
+ if (*cp == '.' || *cp == ',') {
+ if (*(cp+1)) {
+ /* 1st decimal place */
+ if (isdigit(*(cp+1)))
+ *(cp++) = *(cp+1);
+ else
+ *(cp++) = '0';
+ /* 2nd decimal place */
+ if (*(cp+1) && isdigit(*(cp+1)))
+ *(cp++) = *(cp+1);
+ else
+ *(cp++) = '0';
+ } else {
+ *(cp++) = '0';
+ *(cp++) = '0';
+ }
+ } else {
+ *(cp++) = '0';
+ *(cp++) = '0';
+ }
*cp = '\0';
return res;
}
unsigned long int dtaus_int(void *buf, unsigned int pos, unsigned int len)
{
char tmp[30];
- char *bufp = buf;
+ char *bufp = (char *)buf;
static unsigned long int res;
bufp+=pos;
static char word[30];
if (strlen(line) > 0) {
- x = index (line, ' ');
- y = index (line, '\t');
+ x = strchr (line, ' ');
+ y = strchr (line, '\t');
if (!x && !y) {
strncpy(word, line, 29);
char *cp;
int i;
- bzero (line, sizeof(line));
- bzero (buf, len);
+ memset (line, 0, sizeof(line));
+ memset (buf, 0, len);
cp = line;
while (!strlen(line) && (cp = fgets(line, 100, f))) {
while (tmp[strlen(tmp)-1] != '\n' && (cp = fgets(tmp, 100, f)));
} else
line[strlen(line)-1] = '\0';
- if (line[strlen(line)-1] == '\r')
+ if (line[strlen(line)-1] == '\r')
line[strlen(line)-1] = '\0';
for (i=strlen(line);(line[i-1] == ' '||line[i-1] == '\t')&&i>0; i--)
line[i-1] = '\0';
struct tm *loctime;
char tmp[10];
- bzero (buf, 129);
+ memset (buf, 0, 129);
timer = time ( NULL );
loctime = localtime(&timer);
for (i=56;i<56+4; i++) buf[i] = ' '; /* A8 */
for (i=70;i<70+10; i++) buf[i] = '0'; /* A10 */
for (i=80;i<80+48; i++) buf[i] = ' '; /* A11 */
-#ifdef DEFAULT_EURO
- buf[recA[A_EURO].pos] = '1'; /* A12 (Currency) */
-#else
if (use_euro)
- buf[recA[A_EURO].pos] = '1'; /* A12 (Currency) */
+ buf[recA[A_CURR].pos] = '1'; /* A12 (Currency) */
else
- buf[recA[A_EURO].pos] = ' '; /* A12 (Currency) */
-#endif
+ buf[recA[A_CURR].pos] = ' '; /* A12 (Currency) */
}
/*
int i;
int appendix = 0;
- bzero (buf, 257);
+ memset (buf, 0, 257);
if (normaltext)
appendix = 1;
for (i=90;i<90+3; i++) buf[i] = ' '; /* C13 */
for (i=93;i<90+27; i++) buf[i] = ' '; /* C14a (Kunde) */
for (i=120;i<120+8; i++) buf[i] = ' '; /* C14b */
-#ifdef DEFAULT_EURO
- buf[recC[C_EURO].pos] = '1'; /* C17a (Currency) */
-#else
if (use_euro)
buf[recC[C_EURO].pos] = '1'; /* C17a (Currency) */
else
buf[recC[C_EURO].pos] = ' '; /* C17a (Currency) */
-#endif
for (i=183;i<183+2; i++) buf[i] = ' '; /* C17b */
for (i=187;i<187+(29*2); i++) buf[i] = ' '; /* C19-C22 (misc text) */
for (i=245;i<245+11; i++) buf[i] = ' '; /* C23 */
{
int i;
- bzero (buf, 129);
+ memset (buf, 0, 129);
buf[0] = '0';
buf[1] = '1';
buf[2] = '2';
dtaus_prepareA(buf);
buf[5] = values[A_TRANS][0];
buf[6] = values[A_TRANS][1];
- sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_BLZ]),8));
- for (i=0; i<8; i++) buf[recA[A_BLZ].pos+i] = tmp[i];
+ sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_BLZ]),recA[A_BLZ].len));
+ for (i=0; i<recA[A_BLZ].len; i++) buf[recA[A_BLZ].pos+i] = tmp[i];
sprintf (tmp, "%-27.27s", upcase(values[A_NAME]));
for (i=0; i<27; i++) buf[recA[A_NAME].pos+i] = tmp[i];
- sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_KTO]),10));
- for (i=0; i<10; i++) buf[recA[A_KTO].pos+i] = tmp[i];
+ if (values[A_TODO]) {
+ sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_TODO]),recA[A_TODO].len));
+ for (i=0; i<recA[A_TODO].len; i++) buf[recA[A_TODO].pos+i] = tmp[i];
+ }
+ sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_KTO]),recA[A_KTO].len));
+ for (i=0; i<recA[A_KTO].len; i++) buf[recA[A_KTO].pos+i] = tmp[i];
fputs(buf, f);
return 1;
else
for (i=0; i<recC[C_EUR].len; i++) buf[recC[C_EUR].pos+i] = tmp[i];
#else
- for (i=0; i<recC[C_VAL].len; i++) buf[recC[C_VAL].pos+i] = tmp[i];
+ if (use_euro)
+ for (i=0; i<recC[C_VAL].len; i++) buf[recC[C_VAL].pos+i] = tmp[i];
+ else
+ for (i=0; i<recC[C_DM].len; i++) buf[recC[C_DM].pos+i] = tmp[i];
#endif
if (values[C_MYKTO])
sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[C_MYKTO]),10));
else
for (i=0; i<recE[E_EUR].len; i++) buf[recE[E_EUR].pos+i] = tmp[i];
#else
- for (i=0; i<recE[E_VAL].len; i++) buf[recE[E_VAL].pos+i] = tmp[i];
+ if (use_euro)
+ for (i=0; i<recE[E_VAL].len; i++) buf[recE[E_VAL].pos+i] = tmp[i];
+ else
+ for (i=0; i<recE[E_DM].len; i++) buf[recE[E_DM].pos+i] = tmp[i];
#endif
bigint_sprintf (tmp, "%s", kto);
padzeroclip (tmp,17);
fprintf(f, " %s\t%s\n", field, value);
}
+/*
+ * one date line, format it properly
+ */
+void printctlndate(FILE *f, char *field, char *value)
+{
+ char mydate[11];
+ int i;
+
+ if (!strlen(field) || !strlen(value))
+ return;
+
+ for (i=0;isspace (value[i]) && i<= strlen (value); i++);
+ if (i == strlen (value))
+ return;
+
+ memset (mydate, 0, sizeof (mydate));
+ if (strlen (value) == 6) {
+ mydate[0] = value[0];
+ mydate[1] = value[1];
+ mydate[2] = '.';
+ mydate[3] = value[2];
+ mydate[4] = value[3];
+ mydate[5] = '.';
+ mydate[6] = value[4];
+ mydate[7] = value[5];
+ fprintf(f, " %s\t%s\n", field, mydate);
+ } else if (strlen (value) == 8) {
+ mydate[0] = value[0];
+ mydate[1] = value[1];
+ mydate[2] = '.';
+ mydate[3] = value[2];
+ mydate[4] = value[3];
+ mydate[5] = '.';
+ mydate[6] = value[4];
+ mydate[7] = value[5];
+ mydate[8] = value[6];
+ mydate[9] = value[7];
+ fprintf(f, " %s\t%s\n", field, mydate);
+ } else {
+ fprintf (stderr, "Broken date field: %s\n", value);
+ fprintf(f, " %s\t%s\n", field, value);
+ }
+}
+
/*
* Third: Some high level routines
void dtaus2control (char *cdtaus, char *ccontrol)
{
FILE *fdtaus, *fcontrol;
- void *buf;
- void *bufp;
+ char *buf;
+ char *bufp;
char tmp[30];
char x[30];
int index;
fprintf(fcontrol, "BEGIN {\n");
bufp = buf;
-#ifndef DEFAULT_EURO
- for (index=A_TRANS; index <= A_EURO; index++) {
-#else
- for (index=A_TRANS; index < A_EURO; index++) {
-#endif
+ for (index=A_TRANS; index < A_LOOP; index++) {
bufp = buf + recA[index].pos;
memcpy(tmp, bufp, recA[index].len); tmp[recA[index].len] = '\0';
- printctln(fcontrol, recA[index].name, strip_zeros(strip_spaces(tmp)));
+ if (index == A_DATE || index == A_TODO)
+ printctlndate(fcontrol, recA[index].name, tmp);
+ else
+ printctln(fcontrol, recA[index].name, strip_zeros(strip_spaces(tmp)));
}
-#ifndef DEFAULT_EURO
- if (tmp[recA[index].pos] == '1')
+ bufp = buf + recA[A_CURR].pos;
+ if (*bufp == '1') {
use_euro = 1;
-#endif
+ fprintf(fcontrol, " Euro\n");
+ } else {
+ use_euro = 0;
+ fprintf(fcontrol, " DM\n");
+ }
fprintf(fcontrol, "}\n\n");
} else {
} else {
fprintf(fcontrol, "{\n");
- for (index=C_NAME; index < C_EURO; index++) {
+ for (index=C_NAME; index < C_LOOP; index++) {
#ifndef DEFAULT_EURO
if (use_euro && index == C_VAL)
index = C_EUR;
+#else
+ if (!use_euro && index == C_VAL)
+ index = C_DM;
#endif
bufp = buf + recC[index].pos;
memcpy(tmp, bufp, recC[index].len); tmp[recC[index].len] = '\0';
+
+ /*
+ * C_EUR and C_DM are outside of the loop, can only be
+ * selected for the non-default currency, but the value
+ * should be stored in the normal record field.
+ */
#ifndef DEFAULT_EURO
- if (index == C_VAL || index == C_EUR)
+ if (index == C_EUR)
#else
- if (index == C_VAL)
+ if (index == C_DM)
#endif
+ printctln(fcontrol, recC[C_VAL].name, strip_zeros(string2real(tmp)));
+ else if (index == C_VAL)
printctln(fcontrol, recC[index].name, strip_zeros(string2real(tmp)));
else if (index == C_TRANS)
printctln(fcontrol, recC[index].name, strip_zeros(string2trans(tmp)));
#ifndef DEFAULT_EURO
if (use_euro && index == C_EUR)
index = C_VAL;
+#else
+ if (!use_euro && index == C_DM)
+ index = C_VAL;
#endif
}
}
}
if (dtaus_nextrec(buf, fdtaus) != 1)
- bzero (buf, sizeof(buf));
+ memset (buf, 0, sizeof(buf));
/*
* Are there extension records that we have to check?
}
}
if (dtaus_nextrec(buf, fdtaus) != 1)
- bzero (buf, sizeof(buf));
+ memset (buf, 0, sizeof(buf));
extC--;
}
fprintf(fcontrol, "}\n");
#ifndef DEFAULT_EURO
if (use_euro && index == E_VAL)
index = E_EUR;
+#else
+ if (!use_euro && index == E_VAL)
+ index = E_DM;
#endif
+
bufp = buf + recE[index].pos;
memcpy(tmp, bufp, recE[index].len); tmp[recE[index].len] = '\0';
+
#ifndef DEFAULT_EURO
if (index == E_VAL || index == E_EUR)
#else
- if (index == E_VAL)
+ if (index == E_VAL || index == E_DM)
#endif
- printctln(fcontrol, recE[index].name, strip_zeros(string2real(tmp)));
+ printctln(fcontrol, recE[E_VAL].name, strip_zeros(string2real(tmp)));
else
printctln(fcontrol, recE[index].name, strip_zeros(tmp));
#ifndef DEFAULT_EURO
if (use_euro && index == E_EUR)
index = E_VAL;
+#else
+ if (!use_euro && index == E_DM)
+ index = E_VAL;
#endif
}
char **text = NULL;
char *cp;
int textindex = 0;
+ int len, i;
if (!cdtaus) {
if (!(fdtaus = fopen("dtaus0.txt", "w")))
/*
* Record A lesen
*/
- bzero(valA, sizeof(valA));
+ memset (valA, 0, sizeof(valA));
control_nextline ((void *)line, 100, fcontrol);
ident = extract_ident(line);
if (!strcmp(ident, "begin") && (line[0] == '{')) {
while (strlen(line) && line[0] != '}') {
ident = extract_ident(line);
if ((recindex = rec_index(ident, REC_A)) != -1)
-#ifndef DEFAULT_EURO
{
-#endif
if (recA[recindex].type != IGN)
if ((valA[recindex] = (char *)malloc (strlen(line)+1)))
strcpy(valA[recindex], line);
-#ifndef DEFAULT_EURO
} else {
if (! strcasecmp (ident, "euro"))
use_euro = 1;
+ if (! strcasecmp (ident, "dm"))
+ use_euro = 0;
}
-#endif
control_nextline ((void *)line, 100, fcontrol);
}
if (((recindex = rec_index("art", REC_A)) != -1) && valA[recindex] && strlen(valA[recindex])) {
fprintf(fbeleg, "\n Sammelauftrag\n\n");
fprintf(fbeleg, "\n VOL ........................:\n");
fprintf(fbeleg, "\n Erstellungsdatum ...........: %s\n", get_date());
-#ifndef DEFAULT_EURO
+ if (valA[A_TODO]) {
+ fprintf(fbeleg, "\n Ausfuehrugsdatum ...........: %s\n", valA[A_TODO]);
+ }
if (use_euro)
fprintf(fbeleg, "\n Waehrung ...................: Euro\n");
else
fprintf(fbeleg, "\n Waehrung ...................: DM\n");
-#else
- fprintf(fbeleg, "\n Waehrung ...................: Euro\n");
-#endif
}
if (!dtaus_writeA(fdtaus, valA)) {
fprintf (stderr, "Konnte den Anfangsdatensatz nicht schreiben.\n");
else
fprintf (fcheck, " Sammelauftrag\n\n");
fprintf (fcheck, " Erstellungsdatum : %s\n\n", get_date());
-#ifndef DEFAULT_EURO
if (use_euro)
fprintf (fcheck, " Waehrung : Euro\n\n\n");
else
fprintf (fcheck, " Waehrung : DM\n\n\n");
-#else
- fprintf (fcheck, " Waehrung : Euro\n\n\n");
-#endif
fprintf (fcheck, " %-10s %-8s %-30s %12s\n", "Kontonr.", "BLZ", "Name", "Betrag");
fprintf (fcheck, " --------------------------------------------------------------------\n");
} else {
sum_val = bigint_int(0);
sum_blz = bigint_int(0);
sum_kto = bigint_int(0);
- bzero(valC, sizeof(valC));
+ memset (valC, 0, sizeof(valC));
control_nextline ((void *)line, 100, fcontrol);
if (line[0] == '{') {
while (strlen(line) && line[0] == '{') {
}
}
} else {
- if ((valC[recindex] = (char *)malloc (strlen(line)+1)))
- strcpy(valC[recindex], line);
- else
- return 0;
+ len = strlen(line);
+ if (recindex == C_VAL) {
+ /* Convert commast to dots for later processing */
+ for (i=0; line[i]; i++) if (line[i] == ',') line[i] = '.';
+
+ if ((cp = index (line, '.')) == NULL) {
+ if (!(valC[recindex] = (char *)malloc (strlen(line)+4)))
+ return 0;
+ sprintf (valC[recindex], "%s.00", line);
+ } else if ( ((len = cp - line + 3)) < strlen (line)) {
+ if (!(valC[recindex] = (char *)malloc (len+1)))
+ return 0;
+ strncpy (valC[recindex], line, len);
+ valC[recindex][len] = '\0';
+ } else {
+ if (!(valC[recindex] = (char *)malloc (strlen(line)+1)))
+ return 0;
+ strcpy(valC[recindex], line);
+ }
+ } else {
+ if ((valC[recindex] = (char *)malloc (strlen(line)+1)))
+ strcpy(valC[recindex], line);
+ else
+ return 0;
+ }
}
}
control_nextline ((void *)line, 100, fcontrol);
for (recindex=0; recindex<C_LEN; recindex++)
if (valC[recindex])
free(valC[recindex]);
- bzero(valC, sizeof(valC));
+ memset (valC, 0, sizeof(valC));
control_nextline ((void *)line, 100, fcontrol);
}
} else {