1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00

Update to 19990929

PR:		14039
Submitted by:	maintainer
This commit is contained in:
Chris Piazza 1999-09-29 23:08:12 +00:00
parent 88c3d88049
commit 2461f7d026
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=22077
4 changed files with 4 additions and 137 deletions

View File

@ -1,12 +1,12 @@
# New ports collection makefile for: enfle
# Version required: 19990926
# Version required: 19990929
# Date created: Tue Sep 28 02:25:17 JST 1999
# Whom: Yuuki SAWADA <mami@whale.cc.muroran-it.ac.jp>
#
# $FreeBSD$
#
DISTNAME= enfle-19990926
DISTNAME= enfle-19990929
CATEGORIES= graphics
MASTER_SITES= http://enfle.fennel.org/
@ -18,7 +18,7 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-all-plugins\
CONFIGURE_ARGS= --enable-all-plugins \
--enable-plugins-dir
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (enfle-19990926.tar.gz) = ba11e3a0a3971686cd0f6949c17dbaa5
MD5 (enfle-19990929.tar.gz) = f6c4e68163ced24b1168a0c024b9a593

View File

@ -1,101 +0,0 @@
--- plugins/archiver/misc/misc.c.orig Sat Sep 25 17:08:18 1999
+++ plugins/archiver/misc/misc.c Mon Sep 27 23:26:35 1999
@@ -70,7 +70,7 @@
p->version = 1;
p->type = _Archiver;
- p->pluginname = "Misc Format Archiver Plugin version 0.2";
+ p->pluginname = "Misc Format Archiver Plugin version 0.3";
p->pluginshortname = FORMAT_NAME;
p->author = "TAJIRI Yasuhiro";
p->dlhandle = NULL; /* set by plugin_load */
@@ -279,7 +279,8 @@
FILE * fp;
char buf[257];
- fp = fopen(filename,"r");
+ if ((fp = fopen(filename,"r")) == NULL)
+ return 1;
buf[256]=0;
while(fgets(buf,256,fp)!=NULL){
int count = strlen(buf);
@@ -298,12 +299,12 @@
misc_archive_open(Archive *ar)
{
struct fmt_entry *e;
- char tmpsh[20];
+ char tmpsh[256];
static char *preName=NULL;
/* char curTmpDir[500]; */
FILE* fp;
pid_t pid_child;
- MISC_info *info;
+ MISC_info *info = NULL;
char rcfile[50];
char *home;
@@ -312,26 +313,26 @@
fseek(ar->fp, 0L, SEEK_END);
ar->asize = ftell(ar->fp);
fseek(ar->fp, 0L, SEEK_SET);
-
+ ar->nfiles=0;
+ ar->info=NULL;
home = getenv("HOME");
if(home==NULL)
- return 0;
+ goto error;
if( entries == NULL){
sprintf(rcfile,"%s/%s",home,".miscloader");
if(load_inifile(rcfile))
- return 0;
+ goto error;
}
if ((ar->info = calloc(1, sizeof(MISC_info))) == NULL) {
fprintf(stderr, "No enough memory for info\n");
archive_close(ar);
- fclose(ar->fp);
- return 0;
+ goto error;
}
info = (MISC_info *)ar->info;
info->fname=NULL;
e = check_file(ar);
if(e==NULL)
- return 0;
+ goto error;
sprintf(tmpsh,"/tmp/.%s%d",getenv("USER"),(int)(getpid()));
// sprintf(tmpsh,"/tmp/.%s%d%s",getenv("USER"),(int)(getpid()),ar->filename);
tmpdir=strdup(tmpsh);
@@ -354,14 +355,13 @@
} else if (pid_child < 0) {
fprintf(stderr, "fork failed");
exit(0);
- return 0;
+ goto error;
} else {
int status;
// wait(&status);
waitpid(pid_child,&status,0);
}
}
- ar->nfiles=0;
scan_directory(tmpdir,ar);
if (ar->nfiles) {
ar->format = FORMAT_NAME;
@@ -369,6 +369,15 @@
ar->close = misc_archive_close;
return 1;
}
+ error:
+ if(info!=NULL){
+ int i;
+ for (i = 0; i < ar->nfiles; i++)
+ free(info->fname[i]);
+ free(info->fname);
+ free(ar->info);
+ }
+ fclose(ar->fp);
return 0;
}

View File

@ -1,32 +0,0 @@
--- plugins/archiver/tar/tar.c.orig Mon Sep 27 21:42:51 1999
+++ plugins/archiver/tar/tar.c Mon Sep 27 21:46:15 1999
@@ -39,7 +39,7 @@
{
p->version = 1;
p->type = _Archiver;
- p->pluginname = "TAR Format Archiver Plugin version 0.2";
+ p->pluginname = "TAR Format Archiver Plugin version 0.3";
p->pluginshortname = FORMAT_NAME;
p->author = "TAJIRI Yasuhiro";
p->dlhandle = NULL; /* set by plugin_load */
@@ -142,8 +142,10 @@
if (hdr[0] == '\0')
break;
- if (!tar_checksum(hdr))
+ if (!tar_checksum(hdr)){
+ archive_close(info->ar);
return 0;
+ }
size = octal_value(hdr + 124, 12);
flen = strlen(hdr);
if (size == 0 && flen > 0 && hdr[flen - 1] == '/')
@@ -176,7 +178,7 @@
ar->close = tar_archive_close;
return 1;
}
-
+ archive_close(info->ar);
return 0;
}