commit 7f548905cabad761859a2eed0e1577c584c37947
parent 73f34b3ae4d0f840cee68b08ad28386c2c141ffc
Author: Ellenor Bjornsdottir <ellenor@umbrellix.net>
Date: Fri, 7 Oct 2022 00:19:25 +0000
oops, an o file
Diffstat:
12 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -378,3 +378,5 @@ include/qtmp.h
qmail-send.service
*.orig
*.rej
+.dep.*
+*.obj
diff --git a/conf-cc b/conf-cc
@@ -1,3 +1,3 @@
-cc -O3 -Iinclude/ -Iinclude/fmxs
+cc -g -ggdb3 -O0 -Iinclude/ -Iinclude/fmxs -DUSING_SKALIBS -I/package/prog/skalibs/include
This will be used to compile .c files.
diff --git a/qmail-qstat.sh b/qmail-qstat.sh
@@ -1,7 +0,0 @@
-cd QMAIL
-messdirs=`echo queue/mess/* | wc -w`
-messfiles=`find queue/mess/* -print | wc -w`
-tododirs=`echo queue/todo | wc -w`
-todofiles=`find queue/todo -print | wc -w`
-echo messages in queue: `expr $messfiles - $messdirs`
-echo messages in queue but not yet preprocessed: `expr $todofiles - $tododirs`
diff --git a/qmail-upq.sh b/qmail-upq.sh
@@ -1,14 +0,0 @@
-cd QMAIL
-cd queue
-for dir in mess info local remote
-do
- ( cd $dir; find . -type f -print ) | (
- cd $dir
- while read path
- do
- id=`basename "$path"`
- sub=`expr "$id" % SPLIT`
- mv "$path" "$sub"/"$id"
- done
- )
-done
diff --git a/src/mxf-remote/all.do b/src/mxf-remote/all.do
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/bin/sh -x
redo-ifchange mxf-remote
diff --git a/src/mxf-remote/build.env b/src/mxf-remote/build.env
@@ -1,2 +1,3 @@
-CFLAGS="-DUSING_SKALIBS -Werror=all -Werror=pedantic -ferror-limit=60 -Wno-unused-variable -DREMOTEDEBUG"
-INCLUDES="-I/package/prog/skalibs/include -I/package/web/s6-dns/include -I. -I../../include"
+export CFLAGS="-g -ggdb3 -DUSING_SKALIBS -Werror=all -Werror=pedantic -ferror-limit=60 -Wno-unused-variable -Wno-error=unused-but-set-variable -DREMOTEDEBUG"
+export INCLUDES="-I/package/prog/skalibs/include -I/package/web/s6-dns/include -I. -I../../include"
+export LDFLAGS="-L/usr/lib"
diff --git a/src/mxf-remote/default.obj.do b/src/mxf-remote/default.obj.do
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh -x
+env
redo-ifchange "${2}.c" "${2}.h"
redo-ifcreate "${2}.c" "${2}.h"
-${CC:-cc} -c -o "${3}" "${2}.c" "${CFLAGS}" "${INCLUDES}"
+${CC:-cc} ${CFLAGS} ${INCLUDES} -c -o "${3}" "${2}.c"
diff --git a/src/mxf-remote/mxf-remote b/src/mxf-remote/mxf-remote
Binary files differ.
diff --git a/src/mxf-remote/mxf-remote.do b/src/mxf-remote/mxf-remote.do
@@ -1,3 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
redo-ifchange errs.obj mxf-remote.obj typeallocs.obj
-${CCLD:-${CC:-cc}} -o "$3" "${2}.c" "${INCLUDES}" "${CFLAGS}"
+redo-ifcreate errs.obj mxf-remote.obj typeallocs.obj
+${CCLD:-${CC:-cc}} ${LDFLAGS} -o "$3" "${2}.obj" errs.obj typeallocs.obj /package/web/s6-dns/library/lib*dns.a ../ipalloc.o ../constmap.o ../ip.o ../ipme.o ../fs.a ../case.a ../auto_qmail.o ../control.o ../getln.a ../substdio.a ../str.a ../error.a /package/prog/skalibs/library/libskarnet.a
diff --git a/src/mxf-remote/mxf-remote.h b/src/mxf-remote/mxf-remote.h
@@ -1,10 +1,10 @@
#ifndef MXF_REMOTE_H
#define MXF_REMOTE_H
-#include <ga_foreach.h>
+#include "ga_foreach.h"
-#include <typeallocdefs.h>
-#include <typealloc.h>
+#include "typeallocdefs.h"
+#include "typealloc.h"
// I fold, I will use TypeAlloc
#include <noreturn.h>
diff --git a/src/netstrings.o b/src/netstrings.o
Binary files differ.
diff --git a/src/qmail-remote.c b/src/qmail-remote.c
@@ -3,7 +3,11 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include "sig.h"
+#ifdef USING_SKALIBS
+#include <skalibs/stralloc.h>
+#else
#include "stralloc.h"
+#endif
#include "substdio.h"
#include "subfd.h"
#include "scan.h"
@@ -125,7 +129,12 @@ static void get(unsigned char *uc)
substdio_get(&smtpfrom,ch,1);
if (*ch != '\r')
if (smtptext.len < HUGESMTPTEXT)
+#ifdef USING_SKALIBS
+ // skalibs is different on this
+ if (!stralloc_append(&smtptext,*ch)) temp_nomem();
+#else
if (!stralloc_append(&smtptext,ch)) temp_nomem();
+#endif
}
unsigned long smtpcode()
