Skip to content

Commit

Permalink
instqueue: replace it with "instpackage queue"
Browse files Browse the repository at this point in the history
This removes needless code duplication and matches the new interface added for
"instchown queue".
  • Loading branch information
DerDakon committed Jan 28, 2024
1 parent de49864 commit fd5b7fc
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 33 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Expand Up @@ -299,8 +299,6 @@ instchown
instfiles.o
instpackage.o
instpackage
instqueue.o
instqueue
instuidgid.o
home
home+df
Expand Down
1 change: 1 addition & 0 deletions CHANGES.md
@@ -1,3 +1,4 @@
- 20240127 remove instqueue, now replaced by "instpackage queue-only"
- 20221115 honor all groups of qmailr user when spawning qmail-rspawn
- 20221019 code: netstring parsing in qmail-qmtpd & qmail-qmqpd now
checks that the netstring length is actually a number.
Expand Down
12 changes: 1 addition & 11 deletions Makefile
Expand Up @@ -735,16 +735,6 @@ instpackage.o: \
compile instpackage.c open.h strerr.h hier.h
./compile instpackage.c

instqueue: \
load instqueue.o instfiles.o fifo.o hier.o auto_qmail.o auto_split.o strerr.a \
substdio.a open.a error.a env.a str.a fs.a stralloc.a
./load instqueue instfiles.o fifo.o hier.o auto_qmail.o auto_split.o \
strerr.a substdio.a open.a error.a env.a str.a fs.a stralloc.a

instqueue.o: \
compile instqueue.c open.h strerr.h hier.h
./compile instqueue.c

instuidgid.o: \
compile instuidgid.c uidgid.h auto_uids.h auto_users.h
./compile instuidgid.c
Expand Down Expand Up @@ -783,7 +773,7 @@ qmail-pop3d qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd \
qmail-smtpd sendmail tcp-env qmail-newmrh config config-fast \
dnsptr dnsip dnsfq hostname ipmeprint qreceipt qbiff \
forward preline condredirect bouncesaying except maildirmake \
maildir2mbox install instpackage instqueue instchown \
maildir2mbox install instpackage instchown \
instcheck home home+df proc proc+df binm1 binm1+df binm2 binm2+df \
binm3 binm3+df

Expand Down
2 changes: 0 additions & 2 deletions TARGETS
Expand Up @@ -299,8 +299,6 @@ instchown
instfiles.o
instpackage.o
instpackage
instqueue.o
instqueue
instuidgid.o
home
home+df
Expand Down
8 changes: 6 additions & 2 deletions instpackage.c
Expand Up @@ -2,20 +2,24 @@

#include <sys/stat.h>
#include <stddef.h>
#include <string.h>
#include "open.h"
#include "strerr.h"

#define FATAL "instpackage: fatal: "

extern int fdsourcedir;

int main(void)
int main(int argc, char **argv)
{
fdsourcedir = open_read(".");
if (fdsourcedir == -1)
strerr_die2sys(111,FATAL,"unable to open current directory: ");

umask(077);
hier();
if (argc == 2 && strcmp(argv[1],"queue-only") == 0)
hier_queue();
else
hier();
return 0;
}
16 changes: 0 additions & 16 deletions instqueue.c

This file was deleted.

0 comments on commit fd5b7fc

Please sign in to comment.