bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added mbfile rearc

Browse Source
This commit is contained in:
Michiel Broek
2004-03-08 20:51:04 +00:00
parent ea5a8aa2a9
commit 79c89010d0
18 changed files with 594 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Makefile
View File

@@ -5,15 +5,15 @@
include ../Makefile.global
COMMON_SRCS = clcomm.c client.c crc.c semafore.c signame.c charset.c \
attach.c falists.c hdr.c parsedate.c rfcmsg.c unpacker.c \
COMMON_SRCS = clcomm.c client.c crc.c semafore.c signame.c charset.c remask.c \
attach.c falists.c hdr.c parsedate.c rfcmsg.c unpacker.c rearc.c \
batchrd.c ftn.c pktname.c mangle.c sectest.c proglock.c \
dostran.c ftnmsg.c mbfile.c nodelock.c rawio.c strcasestr.c \
execute.c expipe.c getheader.c noderecord.c rfcaddr.c strutil.c \
faddr.c gmtoffset.c packet.c rfcdate.c term.c endian.c timers.c
COMMON_OBJS = clcomm.o client.o crc.o semafore.o signame.o charset.o \
COMMON_OBJS = clcomm.o client.o crc.o semafore.o signame.o charset.o remask.o \
ftscprod.o attach.o falists.o hdr.o parsedate.o rfcmsg.o unpacker.o \
batchrd.o ftn.o pktname.o mangle.o sectest.o proglock.o \
batchrd.o ftn.o pktname.o mangle.o sectest.o proglock.o rearc.o \
dostran.o ftnmsg.o mbfile.o nodelock.o rawio.o strcasestr.o \
execute.o expipe.o getheader.o noderecord.o rfcaddr.o strutil.o \
faddr.o gmtoffset.o packet.o rfcdate.o term.o endian.o timers.o
@@ -132,12 +132,14 @@ crc.o: ../config.h mbselib.h
semafore.o: ../config.h mbselib.h
signame.o: ../config.h mbselib.h
charset.o: ../config.h mbselib.h
remask.o: ../config.h mbselib.h
attach.o: ../config.h mbselib.h
falists.o: ../config.h mbselib.h
hdr.o: ../config.h mbselib.h
parsedate.o: ../config.h mbselib.h
rfcmsg.o: ../config.h mbselib.h
unpacker.o: ../config.h mbselib.h
rearc.o: ../config.h mbselib.h
batchrd.o: ../config.h mbselib.h
ftn.o: ../config.h mbselib.h users.h mbsedb.h
pktname.o: ../config.h mbselib.h

16
lib/mbselib.h
View File

@@ -2434,6 +2434,12 @@ int gpt_running(int); /* Is timer running */
int msleep(int); /* Milliseconds timer */
/*
* remask.c
*/
char *re_mask(char *, int); /* Bluid file mask */
/************************************************************************
*
@@ -2475,8 +2481,14 @@ char *charset_alias_rfc(char *); /* Search RFC alias */
int charset_set_in_out(char *, char *); /* Setup mapping */
/*
* rearc.c
*/
int rearc(char *, char *, int); /* Rearc command */
/************************************************************************
/****************************************************************************
*
* Records data
*/
@@ -2551,8 +2563,6 @@ struct _magic magic;
struct _nodeshdr nodeshdr; /* Fidonet nodes */
struct _nodes nodes;
//struct _bill bill; /* Unsent bills */
struct _newfileshdr newfileshdr; /* New file reports */
struct _newfiles newfiles;

210
lib/rearc.c Normal file
View File

@@ -0,0 +1,210 @@
/*****************************************************************************
*
* $Id$
* Purpose ...............: ReArc an archive.
*
*****************************************************************************
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
* 1971 BV IJmuiden
* the Netherlands
*
* This file is part of MBSE BBS.
*
* This BBS is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
* later version.
*
* MBSE BBS is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with MBSE BBS; see the file COPYING. If not, write to the Free
* Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*****************************************************************************/
#include "../config.h"
#include "mbselib.h"
/*
* Rearchive an archive, if successfull the filename is updated.
* If it fails, return -1.
*/
int rearc(char *filename, char *arctype, int do_quiet)
{
char *p, *uncmd = NULL, *arccmd = NULL, *unarc, *newname, *workpath, *oldpath, *temp;
int rc = 0;
Syslog('f', "rearc(%s, %s)", filename, arctype);
if (!do_quiet) {
colour(12, 0);
printf(" ReArc file %s", filename);
fflush(stdout);
}
if (strchr(filename, '/') == NULL) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" no path in filename\n");
}
Syslog('+', "rearc(%s, %s), no path in filename", filename, arctype);
return -1;
}
if ((unarc = unpacker(filename)) == NULL) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" unknown archive type\n");
}
return -1;
}
if (!getarchiver(unarc)) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" no unarchiver available\n");
}
Syslog('+', "rearc(%s, %s), no unarchiver available", filename, arctype);
return -1;
}
uncmd = xstrcpy(archiver.funarc);
if ((uncmd == NULL) || (uncmd == "")) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" no unarchive command available\n");
}
Syslog('+', "rearc(%s, %s), no unarchive command available", filename, arctype);
return -1;
}
newname = calloc(PATH_MAX, sizeof(char));
strcpy(newname, filename);
p = strrchr(newname, '.');
*p++;
*p = '\0';
if (!getarchiver(arctype)) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" no archiver available\n");
}
Syslog('+', "rearc(%s, %s), no archiver available", filename, arctype);
free(uncmd);
free(newname);
return -1;
}
if (strcmp(unarc, archiver.name) == 0) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" already in %s format\n", arctype);
}
Syslog('+', "rearc(%s, %s), already in %s format", filename, arctype, arctype);
free(uncmd);
free(newname);
return -1;
}
sprintf(p, "%s", archiver.name);
Syslog('f', "new filename %s", newname);
arccmd = xstrcpy(archiver.farc);
if ((arccmd == NULL) || (arccmd == "")) {
if (!do_quiet) {
colour(LIGHTRED, BLACK);
printf(" no archive command available\n");
}
Syslog('+', "rearc(%s, %s), no archive command available", filename, arctype);
free(uncmd);
free(newname);
return -1;
}
/*
* unarchive and archive commands are available, create a temp directory to work in.
*/
workpath = calloc(PATH_MAX, sizeof(char));
oldpath = calloc(PATH_MAX, sizeof(char));
temp = calloc(PATH_MAX, sizeof(char));
getcwd(oldpath, PATH_MAX);
sprintf(workpath, "%s/tmp/rearc%d", getenv("MBSE_ROOT"), getpid());
sprintf(temp, "%s/%s", workpath, filename);
rc = mkdirs(temp, 0755) ? 0 : -1;
if (rc == 0) {
if ((rc = chdir(workpath)) == -1) {
WriteError("$Can't chdir to %s", workpath);
}
}
if (!do_quiet) {
colour(11, 0);
printf("\rUnpacking file %s", filename);
fflush(stdout);
}
/*
* Unarchive
*/
if (rc == 0) {
if ((rc = execute_str(uncmd,filename,(char *)NULL,(char*)"/dev/null",(char*)"/dev/null",(char*)"/dev/null"))) {
sync();
sleep(1);
WriteError("Warning: unpack %s failed, trying again after sync()", filename);
if ((rc = execute_str(uncmd,filename,(char *)NULL,(char*)"/dev/null",(char*)"/dev/null",(char*)"/dev/null"))) {
WriteError("$Can't unpack %s", filename);
}
}
}
if (!do_quiet) {
colour(10, 0);
printf("\r Packing file %s", filename);
}
/*
* Archive
*/
if (rc == 0) {
if ((rc = execute_str(arccmd,newname,(char *)".",(char*)"/dev/null",(char*)"/dev/null",(char*)"/dev/null"))) {
sync();
sleep(1);
WriteError("Warning: pack %s failed, trying again after sync()", newname);
if ((rc = execute_str(arccmd,newname,(char *)".",(char*)"/dev/null",(char*)"/dev/null",(char*)"/dev/null"))) {
WriteError("$Can't pack %s", newname);
}
}
}
if (rc == 0)
unlink(filename);
if ((rc = chdir(oldpath)) == -1) {
WriteError("$Can't chdir to %s", oldpath);
}
/*
* Clean and remove workdir
*/
sprintf(temp, "-rf %s", workpath);
execute_pth((char *)"rm", temp, (char*)"/dev/null", (char*)"/dev/null", (char*)"/dev/null");
if (rc == 0)
sprintf(filename, "%s", newname);
free(workpath);
free(oldpath);
free(temp);
free(uncmd);
free(arccmd);
free(newname);
return rc;
}

85
lib/remask.c Normal file
View File

@@ -0,0 +1,85 @@
/*****************************************************************************
*
* $Id$
* Purpose ...............: Regular Expression Mask
*
*****************************************************************************
* Copyright (C) 1997-2004
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
* 1971 BV IJmuiden
* the Netherlands
*
* This file is part of MBSE BBS.
*
* This BBS is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
* later version.
*
* MBSE BBS is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with MBSE BBS; see the file COPYING. If not, write to the Free
* Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*****************************************************************************/
#include "../config.h"
#include "mbselib.h"
char *re_mask(char *nm, int forceupper)
{
char *p, *q;
static char mask[256];
memset(&mask, 0, sizeof(mask));
if (forceupper)
p = tl(nm);
else
p = nm;
q = mask;
*q++ = '^';
while ((*p) && (q < (mask + sizeof(mask) - 4))) {
switch (*p) {
case '\\': *q++ = '\\';
*q++ = '\\';
break;
case '?': *q++ = '.';
break;
case '.': *q++ = '\\';
*q++ = '.';
break;
case '+': *q++ = '\\';
*q++ = '+';
break;
case '*': *q++ = '.';
*q++ = '*';
break;
case '@': sprintf(q, "[A-Za-z]");
while (*q)
q++;
break;
case '#': sprintf(q, "[0-9]");
while (*q)
q++;
break;
default: if (forceupper)
*q++ = toupper(*p);
else
*q++ = *p;
break;
}
p++;
}
*q++ = '$';
*q++ = '\0';
Syslog('f', "Search mask \"%s\" => \"%s\"", nm, mask);
return mask;
}