Use fsm for building.
CVS patchset: 4514 CVS date: 2001/02/02 15:04:44
This commit is contained in:
jbj
parent
1363a3339d
commit
e3d5247174
11
build/pack.c
11
build/pack.c
|
|
@ -41,6 +41,7 @@ static int cpio_doio(FD_t fdo, Header h, CSA_t * csa, const char * fmodeMacro)
|
|||
const char * rootDir = "/";
|
||||
rpmdb rpmdb = NULL;
|
||||
rpmTransactionSet ts = rpmtransCreateSet(rpmdb, rootDir);
|
||||
TFI_t fi = csa->cpioList;
|
||||
const char *fmode = rpmExpand(fmodeMacro, NULL);
|
||||
const char *failedFile = NULL;
|
||||
FD_t cfd;
|
||||
|
|
@ -50,15 +51,19 @@ static int cpio_doio(FD_t fdo, Header h, CSA_t * csa, const char * fmodeMacro)
|
|||
fmode = xstrdup("w9.gzdio");
|
||||
(void) Fflush(fdo);
|
||||
cfd = Fdopen(fdDup(Fileno(fdo)), fmode);
|
||||
rc = cpioBuildArchive(ts, csa->cpioList, cfd,
|
||||
&csa->cpioArchiveSize, &failedFile);
|
||||
|
||||
rc = fsmSetup(fi->fsm, ts, fi, cfd, &csa->cpioArchiveSize, &failedFile);
|
||||
rc = cpioBuildArchive(fi->fsm);
|
||||
|
||||
Fclose(cfd);
|
||||
(void) fsmTeardown(fi->fsm);
|
||||
|
||||
if (rc) {
|
||||
rpmError(RPMERR_CPIO, _("create archive failed on file %s: %s\n"),
|
||||
failedFile, cpioStrerror(rc));
|
||||
rc = 1;
|
||||
}
|
||||
|
||||
Fclose(cfd);
|
||||
if (failedFile)
|
||||
free((void *)failedFile);
|
||||
free((void *)fmode);
|
||||
|
|
|
|||
694
lib/cpio.c
694
lib/cpio.c
|
|
@ -32,22 +32,6 @@ static /*@null@*/ void * _free(/*@only@*/ /*@null@*/ const void * this) {
|
|||
|
||||
int _fsm_debug = 1;
|
||||
|
||||
/** \ingroup payload
|
||||
* Defines a single file to be included in a cpio payload.
|
||||
*/
|
||||
struct cpioFileMapping {
|
||||
/*@dependent@*/ const char * archivePath; /*!< Path to store in cpio archive. */
|
||||
/*@dependent@*/ const char * dirName; /*!< Payload file directory. */
|
||||
/*@dependent@*/ const char * baseName; /*!< Payload file base name. */
|
||||
/*@dependent@*/ const char * md5sum; /*!< File MD5 sum (NULL disables). */
|
||||
fileAction action;
|
||||
int commit;
|
||||
mode_t finalMode; /*!< Mode of payload file (from header). */
|
||||
uid_t finalUid; /*!< Uid of payload file (from header). */
|
||||
gid_t finalGid; /*!< Gid of payload file (from header). */
|
||||
cpioMapFlags mapFlags;
|
||||
};
|
||||
|
||||
/** \ingroup payload
|
||||
* Keeps track of the set of all hard links to a file in an archive.
|
||||
*/
|
||||
|
|
@ -73,6 +57,67 @@ enum hardLinkType {
|
|||
HARDLINK_BUILD
|
||||
};
|
||||
|
||||
/** \ingroup payload
|
||||
* Defines a single file to be included in a cpio payload.
|
||||
*/
|
||||
struct cpioFileMapping {
|
||||
/*@dependent@*/ const char * archivePath; /*!< Path to store in cpio archive. */
|
||||
/*@dependent@*/ const char * dirName; /*!< Payload file directory. */
|
||||
/*@dependent@*/ const char * baseName; /*!< Payload file base name. */
|
||||
/*@dependent@*/ const char * md5sum; /*!< File MD5 sum (NULL disables). */
|
||||
fileAction action;
|
||||
int commit;
|
||||
mode_t finalMode; /*!< Mode of payload file (from header). */
|
||||
uid_t finalUid; /*!< Uid of payload file (from header). */
|
||||
gid_t finalGid; /*!< Gid of payload file (from header). */
|
||||
cpioMapFlags mapFlags;
|
||||
};
|
||||
|
||||
/**
|
||||
*/
|
||||
struct mapi {
|
||||
/*@dependent@*/ rpmTransactionSet ts;
|
||||
/*@dependent@*/ TFI_t fi;
|
||||
int isave;
|
||||
int i;
|
||||
struct cpioFileMapping map;
|
||||
};
|
||||
|
||||
/** \ingroup payload
|
||||
* File name and stat information.
|
||||
*/
|
||||
struct cpioHeader {
|
||||
/*@owned@*/ const char * path;
|
||||
/*@owned@*/ const char * opath;
|
||||
FD_t cfd;
|
||||
/*@owned@*/ void * mapi;
|
||||
/*@dependent@*/ const void * map;
|
||||
/*@owned@*/ struct hardLink * links;
|
||||
/*@dependent@*/ struct hardLink * li;
|
||||
unsigned int * archiveSize;
|
||||
/*@dependent@*/ const char ** failedFile;
|
||||
/*@owned@*/ short * dnlx;
|
||||
/*@shared@*/ const char * subdir;
|
||||
char subbuf[64]; /* XXX eliminate */
|
||||
/*@shared@*/ const char * osuffix;
|
||||
/*@shared@*/ const char * nsuffix;
|
||||
/*@shared@*/ const char * suffix;
|
||||
char sufbuf[64]; /* XXX eliminate */
|
||||
/*@only@*/ char * ldn;
|
||||
int ldnlen;
|
||||
int ldnalloc;
|
||||
int postpone;
|
||||
int statdone;
|
||||
int mkdirsdone;
|
||||
mode_t dperms;
|
||||
mode_t fperms;
|
||||
int rc;
|
||||
fileAction action;
|
||||
fileStage stage;
|
||||
struct stat osb;
|
||||
struct stat sb;
|
||||
};
|
||||
|
||||
/** \ingroup payload
|
||||
* Cpio archive header information.
|
||||
* @todo Add support for tar (soon) and ar (eventually) archive formats.
|
||||
|
|
@ -96,19 +141,16 @@ struct cpioCrcPhysicalHeader {
|
|||
|
||||
#define PHYS_HDR_SIZE 110 /*!< Don't depend on sizeof(struct) */
|
||||
|
||||
#if 0
|
||||
static void prtli(const char *msg, struct hardLink * li)
|
||||
{
|
||||
if (msg) fprintf(stderr, "%s", msg);
|
||||
fprintf(stderr, "%p next %p files %p fileMaps %p dev %x ino %x nlink %d left %d createdPath %d size %d\n", li, li->next, li->files, li->fileMaps, (unsigned)li->dev, (unsigned)li->inode, li->nlink, li->linksLeft, li->createdPath, li->sb.st_size);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
*/
|
||||
static int mapFlags(/*@null@*/ const void * this, cpioMapFlags mask) {
|
||||
const struct cpioFileMapping * map = this;
|
||||
return (map ? (map->mapFlags & mask) : 0);
|
||||
static int fsmFlags(FSM_t fsm, cpioMapFlags mask) {
|
||||
struct mapi * mapi = (struct mapi *) fsm->mapi;
|
||||
int rc = 0;
|
||||
if (mapi) {
|
||||
const struct cpioFileMapping * map = fsm->map;
|
||||
rc = (map->mapFlags & mask);
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -130,8 +172,6 @@ static /*@only@*/ const char * mapArchivePath(/*@null@*/ const void * this) {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param this
|
||||
* @param st path mode type (dirs map differently)
|
||||
*/
|
||||
static /*@only@*//*@null@*/ const char * mapFsPath(/*@null@*/ const void * this,
|
||||
/*@null@*/ const struct stat * st,
|
||||
|
|
@ -188,15 +228,6 @@ static /*@observer@*/ const char * const mapMd5sum(/*@null@*/ const void * this)
|
|||
return (map ? map->md5sum : NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
struct mapi {
|
||||
/*@dependent@*/ rpmTransactionSet ts;
|
||||
/*@dependent@*/ TFI_t fi;
|
||||
int i;
|
||||
struct cpioFileMapping map;
|
||||
};
|
||||
|
||||
/**
|
||||
*/
|
||||
static /*@only@*/ /*@null@*/ void * mapLink(const void * this) {
|
||||
|
|
@ -211,10 +242,182 @@ static /*@only@*/ /*@null@*/ void * mapLink(const void * this) {
|
|||
|
||||
/**
|
||||
*/
|
||||
static inline /*@null@*/ void * mapFree(/*@only@*/ const void * this) {
|
||||
static inline /*@null@*/ void * mapFree(/*@only@*//*@null@*/ const void * this) {
|
||||
return _free((void *)this);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static /*@null@*/ void * mapFreeIterator(/*@only@*//*@null@*/const void * this) {
|
||||
return _free((void *)this);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static void *
|
||||
mapInitIterator(/*@kept@*/ const void * this, /*@kept@*/ const void * that)
|
||||
{
|
||||
struct mapi * mapi;
|
||||
rpmTransactionSet ts = (void *)this;
|
||||
TFI_t fi = (void *)that;
|
||||
|
||||
if (fi == NULL)
|
||||
return NULL;
|
||||
mapi = xcalloc(1, sizeof(*mapi));
|
||||
mapi->ts = ts;
|
||||
mapi->fi = fi;
|
||||
mapi->isave = mapi->i = 0;
|
||||
|
||||
if (ts && ts->notify) {
|
||||
(void)ts->notify(fi->h, RPMCALLBACK_INST_START, 0, fi->archiveSize,
|
||||
(fi->ap ? fi->ap->key : NULL), ts->notifyData);
|
||||
}
|
||||
|
||||
return mapi;
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static const void * mapNextIterator(void * this) {
|
||||
struct mapi * mapi = this;
|
||||
rpmTransactionSet ts = mapi->ts;
|
||||
TFI_t fi = mapi->fi;
|
||||
struct cpioFileMapping * map = &mapi->map;
|
||||
int i;
|
||||
|
||||
do {
|
||||
if (!((i = mapi->i) < fi->fc))
|
||||
return NULL;
|
||||
mapi->i++;
|
||||
} while (fi->actions && XFA_SKIPPING(fi->actions[i]));
|
||||
|
||||
mapi->isave = i;
|
||||
|
||||
/* src rpms have simple base name in payload. */
|
||||
map->archivePath = (fi->apath ? fi->apath[i] + fi->striplen : fi->bnl[i]);
|
||||
map->dirName = fi->dnl[fi->dil[i]];
|
||||
map->baseName = fi->bnl[i];
|
||||
map->md5sum = (fi->fmd5s ? fi->fmd5s[i] : NULL);
|
||||
map->action = (fi->actions ? fi->actions[i] : FA_UNKNOWN);
|
||||
|
||||
#define _tsmask (RPMTRANS_FLAG_PKGCOMMIT | RPMTRANS_FLAG_COMMIT)
|
||||
map->commit = (ts->transFlags & _tsmask) ? 0 : 1;
|
||||
#undef _tsmask
|
||||
|
||||
map->finalMode = fi->fmodes[i];
|
||||
map->finalUid = (fi->fuids ? fi->fuids[i] : fi->uid); /* XXX chmod u-s */
|
||||
map->finalGid = (fi->fgids ? fi->fgids[i] : fi->gid); /* XXX chmod g-s */
|
||||
map->mapFlags = (fi->fmapflags ? fi->fmapflags[i] : fi->mapflags);
|
||||
return map;
|
||||
}
|
||||
|
||||
int pkgAction(const rpmTransactionSet ts, TFI_t fi, int i, fileStage a)
|
||||
{
|
||||
int nb = (!ts->chrootDone ? strlen(ts->rootDir) : 0);
|
||||
char * opath = alloca(nb + fi->dnlmax + fi->bnlmax + 64);
|
||||
char * o = (!ts->chrootDone ? stpcpy(opath, ts->rootDir) : opath);
|
||||
char * npath = alloca(nb + fi->dnlmax + fi->bnlmax + 64);
|
||||
char * n = (!ts->chrootDone ? stpcpy(npath, ts->rootDir) : npath);
|
||||
char * ext = NULL;
|
||||
int rc = 0;
|
||||
|
||||
switch (fi->actions[i]) {
|
||||
case FA_REMOVE:
|
||||
break;
|
||||
case FA_BACKUP:
|
||||
if (fi->type == TR_REMOVED)
|
||||
break;
|
||||
/*@fallthrough@*/
|
||||
case FA_SKIP:
|
||||
case FA_SKIPMULTILIB:
|
||||
case FA_UNKNOWN:
|
||||
case FA_SKIPNSTATE:
|
||||
case FA_SKIPNETSHARED:
|
||||
case FA_SAVE:
|
||||
case FA_ALTNAME:
|
||||
case FA_CREATE:
|
||||
return 0;
|
||||
/*@notreached@*/ break;
|
||||
}
|
||||
|
||||
rpmMessage(RPMMESS_DEBUG, _(" file: %s%s action: %s\n"),
|
||||
fi->dnl[fi->dil[i]], fi->bnl[i],
|
||||
fileActionString((fi->actions ? fi->actions[i] : FA_UNKNOWN)) );
|
||||
|
||||
switch (fi->actions[i]) {
|
||||
case FA_SKIP:
|
||||
case FA_SKIPMULTILIB:
|
||||
case FA_UNKNOWN:
|
||||
case FA_CREATE:
|
||||
case FA_SKIPNSTATE:
|
||||
case FA_SKIPNETSHARED:
|
||||
case FA_ALTNAME:
|
||||
case FA_SAVE:
|
||||
return 0;
|
||||
/*@notreached@*/ break;
|
||||
|
||||
case FA_BACKUP:
|
||||
ext = (fi->type == TR_ADDED ? SUFFIX_RPMORIG : SUFFIX_RPMSAVE);
|
||||
break;
|
||||
|
||||
case FA_REMOVE:
|
||||
assert(fi->type == TR_REMOVED);
|
||||
/* Append file name to (possible) root dir. */
|
||||
(void) stpcpy( stpcpy(o, fi->dnl[fi->dil[i]]), fi->bnl[i]);
|
||||
if (S_ISDIR(fi->fmodes[i])) {
|
||||
rc = rmdir(opath);
|
||||
if (!rc) return rc;
|
||||
switch (errno) {
|
||||
case ENOENT: /* XXX rmdir("/") linux 2.2.x kernel hack */
|
||||
case ENOTEMPTY:
|
||||
#ifdef NOTYET
|
||||
if (fi->fflags[i] & RPMFILE_MISSINGOK)
|
||||
return 0;
|
||||
#endif
|
||||
rpmError(RPMERR_RMDIR,
|
||||
_("%s: cannot remove %s - directory not empty\n"),
|
||||
fiTypeString(fi), o);
|
||||
break;
|
||||
default:
|
||||
rpmError(RPMERR_RMDIR,
|
||||
_("%s rmdir of %s failed: %s\n"),
|
||||
fiTypeString(fi), o, strerror(errno));
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
/*@notreached@*/ break;
|
||||
}
|
||||
rc = unlink(opath);
|
||||
if (!rc) return rc;
|
||||
if (errno == ENOENT && (fi->fflags[i] & RPMFILE_MISSINGOK))
|
||||
return 0;
|
||||
rpmError(RPMERR_UNLINK, _("%s removal of %s failed: %s\n"),
|
||||
fiTypeString(fi), o, strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ext == NULL) return 0;
|
||||
|
||||
/* Append file name to (possible) root dir. */
|
||||
(void) stpcpy( stpcpy(o, fi->dnl[fi->dil[i]]), fi->bnl[i]);
|
||||
|
||||
/* XXX TR_REMOVED dinna do this. */
|
||||
rc = access(opath, F_OK);
|
||||
if (rc != 0) return 0;
|
||||
|
||||
(void) stpcpy( stpcpy(n, o), ext);
|
||||
rpmMessage(RPMMESS_WARNING, _("%s: %s saved as %s\n"),
|
||||
fiTypeString(fi), o, n);
|
||||
|
||||
rc = rename(opath, npath);
|
||||
if (!rc) return rc;
|
||||
|
||||
rpmError(RPMERR_RENAME, _("%s rename of %s to %s failed: %s\n"),
|
||||
fiTypeString(fi), o, n, strerror(errno));
|
||||
return 1;
|
||||
|
||||
}
|
||||
|
||||
struct dnli {
|
||||
/*@dependent@*/ TFI_t fi;
|
||||
/*@only@*/ /*@null@*/ char * active;
|
||||
|
|
@ -327,204 +530,6 @@ static const char * dnlNextIterator(void * this) {
|
|||
return (i >= 0 && i < dnli->fi->dc ? fi->dnl[i] : NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static /*@null@*/ void * mapFreeIterator(/*@only@*/ /*@null@*/ const void * this)
|
||||
{
|
||||
return _free((void *)this);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static void *
|
||||
mapInitIterator(/*@kept@*/ const void * this, /*@kept@*/ const void * that)
|
||||
{
|
||||
struct mapi * mapi;
|
||||
rpmTransactionSet ts = (void *)this;
|
||||
TFI_t fi = (void *)that;
|
||||
|
||||
if (fi == NULL)
|
||||
return NULL;
|
||||
mapi = xcalloc(1, sizeof(*mapi));
|
||||
mapi->ts = ts;
|
||||
mapi->fi = fi;
|
||||
mapi->i = 0;
|
||||
|
||||
if (ts && ts->notify) {
|
||||
(void)ts->notify(fi->h, RPMCALLBACK_INST_START, 0, fi->archiveSize,
|
||||
(fi->ap ? fi->ap->key : NULL), ts->notifyData);
|
||||
}
|
||||
|
||||
return mapi;
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static const void * mapNextIterator(void * this) {
|
||||
struct mapi * mapi = this;
|
||||
rpmTransactionSet ts = mapi->ts;
|
||||
TFI_t fi = mapi->fi;
|
||||
struct cpioFileMapping * map = &mapi->map;
|
||||
int i;
|
||||
|
||||
do {
|
||||
if (!((i = mapi->i) < fi->fc))
|
||||
return NULL;
|
||||
mapi->i++;
|
||||
} while (fi->actions && XFA_SKIPPING(fi->actions[i]));
|
||||
|
||||
/* src rpms have simple base name in payload. */
|
||||
map->archivePath = (fi->apath ? fi->apath[i] + fi->striplen : fi->bnl[i]);
|
||||
map->dirName = fi->dnl[fi->dil[i]];
|
||||
map->baseName = fi->bnl[i];
|
||||
map->md5sum = (fi->fmd5s ? fi->fmd5s[i] : NULL);
|
||||
map->action = (fi->actions ? fi->actions[i] : FA_UNKNOWN);
|
||||
|
||||
#define _tsmask (RPMTRANS_FLAG_PKGCOMMIT | RPMTRANS_FLAG_COMMIT)
|
||||
map->commit = (ts->transFlags & _tsmask) ? 0 : 1;
|
||||
#undef _tsmask
|
||||
|
||||
map->finalMode = fi->fmodes[i];
|
||||
map->finalUid = (fi->fuids ? fi->fuids[i] : fi->uid); /* XXX chmod u-s */
|
||||
map->finalGid = (fi->fgids ? fi->fgids[i] : fi->gid); /* XXX chmod g-s */
|
||||
map->mapFlags = (fi->fmapflags ? fi->fmapflags[i] : fi->mapflags);
|
||||
return map;
|
||||
}
|
||||
|
||||
static inline /*@null@*/ rpmTransactionSet mapGetTs(/*@null@*/ const void * this) {
|
||||
rpmTransactionSet ts = NULL;
|
||||
if (this) {
|
||||
const struct mapi * mapi = this;
|
||||
ts = mapi->ts;
|
||||
}
|
||||
return ts;
|
||||
}
|
||||
|
||||
static inline /*@null@*/ TFI_t mapGetFi(/*@null@*/ const void * this) {
|
||||
TFI_t fi = NULL;
|
||||
if (this) {
|
||||
const struct mapi * mapi = this;
|
||||
fi = mapi->fi;
|
||||
}
|
||||
return fi;
|
||||
}
|
||||
|
||||
static inline int mapGetIndex(/*@null@*/ const void * this) {
|
||||
int i = -1;
|
||||
if (this) {
|
||||
const struct mapi * mapi = this;
|
||||
i = mapi->i;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
int pkgAction(const rpmTransactionSet ts, TFI_t fi, int i, fileStage a)
|
||||
{
|
||||
int nb = (!ts->chrootDone ? strlen(ts->rootDir) : 0);
|
||||
char * opath = alloca(nb + fi->dnlmax + fi->bnlmax + 64);
|
||||
char * o = (!ts->chrootDone ? stpcpy(opath, ts->rootDir) : opath);
|
||||
char * npath = alloca(nb + fi->dnlmax + fi->bnlmax + 64);
|
||||
char * n = (!ts->chrootDone ? stpcpy(npath, ts->rootDir) : npath);
|
||||
char * ext = NULL;
|
||||
int rc = 0;
|
||||
|
||||
switch (fi->actions[i]) {
|
||||
case FA_REMOVE:
|
||||
break;
|
||||
case FA_BACKUP:
|
||||
if (fi->type == TR_REMOVED)
|
||||
break;
|
||||
/*@fallthrough@*/
|
||||
case FA_SKIP:
|
||||
case FA_SKIPMULTILIB:
|
||||
case FA_UNKNOWN:
|
||||
case FA_SKIPNSTATE:
|
||||
case FA_SKIPNETSHARED:
|
||||
case FA_SAVE:
|
||||
case FA_ALTNAME:
|
||||
case FA_CREATE:
|
||||
return 0;
|
||||
/*@notreached@*/ break;
|
||||
}
|
||||
|
||||
rpmMessage(RPMMESS_DEBUG, _(" file: %s%s action: %s\n"),
|
||||
fi->dnl[fi->dil[i]], fi->bnl[i],
|
||||
fileActionString((fi->actions ? fi->actions[i] : FA_UNKNOWN)) );
|
||||
|
||||
switch (fi->actions[i]) {
|
||||
case FA_SKIP:
|
||||
case FA_SKIPMULTILIB:
|
||||
case FA_UNKNOWN:
|
||||
case FA_CREATE:
|
||||
case FA_SKIPNSTATE:
|
||||
case FA_SKIPNETSHARED:
|
||||
case FA_ALTNAME:
|
||||
case FA_SAVE:
|
||||
return 0;
|
||||
/*@notreached@*/ break;
|
||||
|
||||
case FA_BACKUP:
|
||||
ext = (fi->type == TR_ADDED ? SUFFIX_RPMORIG : SUFFIX_RPMSAVE);
|
||||
break;
|
||||
|
||||
case FA_REMOVE:
|
||||
assert(fi->type == TR_REMOVED);
|
||||
/* Append file name to (possible) root dir. */
|
||||
(void) stpcpy( stpcpy(o, fi->dnl[fi->dil[i]]), fi->bnl[i]);
|
||||
if (S_ISDIR(fi->fmodes[i])) {
|
||||
rc = rmdir(opath);
|
||||
if (!rc) return rc;
|
||||
switch (errno) {
|
||||
case ENOENT: /* XXX rmdir("/") linux 2.2.x kernel hack */
|
||||
case ENOTEMPTY:
|
||||
#ifdef NOTYET
|
||||
if (fi->fflags[i] & RPMFILE_MISSINGOK)
|
||||
return 0;
|
||||
#endif
|
||||
rpmError(RPMERR_RMDIR,
|
||||
_("%s: cannot remove %s - directory not empty\n"),
|
||||
fiTypeString(fi), o);
|
||||
break;
|
||||
default:
|
||||
rpmError(RPMERR_RMDIR,
|
||||
_("%s rmdir of %s failed: %s\n"),
|
||||
fiTypeString(fi), o, strerror(errno));
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
/*@notreached@*/ break;
|
||||
}
|
||||
rc = unlink(opath);
|
||||
if (!rc) return rc;
|
||||
if (errno == ENOENT && (fi->fflags[i] & RPMFILE_MISSINGOK))
|
||||
return 0;
|
||||
rpmError(RPMERR_UNLINK, _("%s removal of %s failed: %s\n"),
|
||||
fiTypeString(fi), o, strerror(errno));
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ext == NULL) return 0;
|
||||
|
||||
/* Append file name to (possible) root dir. */
|
||||
(void) stpcpy( stpcpy(o, fi->dnl[fi->dil[i]]), fi->bnl[i]);
|
||||
|
||||
/* XXX TR_REMOVED dinna do this. */
|
||||
rc = access(opath, F_OK);
|
||||
if (rc != 0) return 0;
|
||||
|
||||
(void) stpcpy( stpcpy(n, o), ext);
|
||||
rpmMessage(RPMMESS_WARNING, _("%s: %s saved as %s\n"),
|
||||
fiTypeString(fi), o, n);
|
||||
|
||||
rc = rename(opath, npath);
|
||||
if (!rc) return rc;
|
||||
|
||||
rpmError(RPMERR_RENAME, _("%s rename of %s to %s failed: %s\n"),
|
||||
fiTypeString(fi), o, n, strerror(errno));
|
||||
return 1;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
static int cpioStrCmp(const void * a, const void * b) {
|
||||
|
|
@ -623,40 +628,6 @@ static /*@null@*/ void * freeHardLink(/*@only@*/ /*@null@*/ struct hardLink * li
|
|||
return _free(li);
|
||||
}
|
||||
|
||||
/** \ingroup payload
|
||||
* File name and stat information.
|
||||
*/
|
||||
struct cpioHeader {
|
||||
/*@owned@*/ const char * path;
|
||||
/*@owned@*/ const char * opath;
|
||||
FD_t cfd;
|
||||
/*@owned@*/ void * mapi;
|
||||
/*@dependent@*/ const void * map;
|
||||
/*@owned@*/ struct hardLink * links;
|
||||
/*@dependent@*/ struct hardLink * li;
|
||||
/*@dependent@*/ const char ** failedFile;
|
||||
/*@owned@*/ short * dnlx;
|
||||
/*@shared@*/ const char * subdir;
|
||||
char subbuf[64]; /* XXX eliminate */
|
||||
/*@shared@*/ const char * osuffix;
|
||||
/*@shared@*/ const char * nsuffix;
|
||||
/*@shared@*/ const char * suffix;
|
||||
char sufbuf[64]; /* XXX eliminate */
|
||||
/*@only@*/ char * ldn;
|
||||
int ldnlen;
|
||||
int ldnalloc;
|
||||
int postpone;
|
||||
int statdone;
|
||||
int mkdirsdone;
|
||||
mode_t dperms;
|
||||
mode_t fperms;
|
||||
int rc;
|
||||
fileAction action;
|
||||
fileStage stage;
|
||||
struct stat osb;
|
||||
struct stat sb;
|
||||
};
|
||||
|
||||
FSM_t newFSM(void) {
|
||||
FSM_t fsm = xcalloc(1, sizeof(*fsm));
|
||||
return fsm;
|
||||
|
|
@ -1050,6 +1021,12 @@ int fsmStage(FSM_t fsm, fileStage stage)
|
|||
switch (stage) {
|
||||
case FSM_UNKNOWN:
|
||||
break;
|
||||
case FSM_INSTALL:
|
||||
break;
|
||||
case FSM_ERASE:
|
||||
break;
|
||||
case FSM_BUILD:
|
||||
break;
|
||||
case FSM_CREATE:
|
||||
fsm->path = NULL;
|
||||
fsm->dnlx = _free(fsm->dnlx);
|
||||
|
|
@ -1098,17 +1075,17 @@ int fsmStage(FSM_t fsm, fileStage stage)
|
|||
fsm->map = mapFind(fsm->mapi, fsm->path);
|
||||
fsm->action = fsmAction(fsm, &fsm->osuffix, &fsm->nsuffix);
|
||||
|
||||
if (mapFlags(fsm->map, CPIO_MAP_PATH) || fsm->nsuffix) {
|
||||
if (fsmFlags(fsm, CPIO_MAP_PATH) || fsm->nsuffix) {
|
||||
fsm->path = _free(fsm->path);
|
||||
fsm->path = mapFsPath(fsm->map, st, fsm->subdir,
|
||||
(fsm->suffix ? fsm->suffix : fsm->nsuffix));
|
||||
}
|
||||
|
||||
if (mapFlags(fsm->map, CPIO_MAP_MODE))
|
||||
if (fsmFlags(fsm, CPIO_MAP_MODE))
|
||||
st->st_mode = mapFinalMode(fsm->map);
|
||||
if (mapFlags(fsm->map, CPIO_MAP_UID))
|
||||
if (fsmFlags(fsm, CPIO_MAP_UID))
|
||||
st->st_uid = mapFinalUid(fsm->map);
|
||||
if (mapFlags(fsm->map, CPIO_MAP_GID))
|
||||
if (fsmFlags(fsm, CPIO_MAP_GID))
|
||||
st->st_gid = mapFinalGid(fsm->map);
|
||||
break;
|
||||
case FSM_MKDIRS:
|
||||
|
|
@ -1643,7 +1620,7 @@ if (rc < 0 && errno != ENOENT) fprintf(stderr, "*** %s(%s,%p) %m\n", cur, fsm->p
|
|||
}
|
||||
|
||||
int fsmSetup(FSM_t fsm, const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
||||
const char ** failedFile)
|
||||
unsigned int * archiveSize, const char ** failedFile)
|
||||
{
|
||||
int rc = fsmStage(fsm, FSM_CREATE);
|
||||
|
||||
|
|
@ -1652,6 +1629,7 @@ int fsmSetup(FSM_t fsm, const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
|||
fdSetCpioPos(fsm->cfd, 0);
|
||||
}
|
||||
fsm->mapi = mapInitIterator(ts, fi);
|
||||
fsm->archiveSize = archiveSize;
|
||||
fsm->failedFile = failedFile;
|
||||
if (fsm->failedFile)
|
||||
*fsm->failedFile = NULL;
|
||||
|
|
@ -1672,27 +1650,28 @@ int fsmTeardown(FSM_t fsm) {
|
|||
}
|
||||
|
||||
rpmTransactionSet fsmGetTs(FSM_t fsm) {
|
||||
return (fsm ? mapGetTs(fsm->mapi) : NULL);
|
||||
struct mapi * mapi = fsm->mapi;
|
||||
return (mapi ? mapi->ts : NULL);
|
||||
}
|
||||
|
||||
TFI_t fsmGetFi(FSM_t fsm) {
|
||||
return (fsm ? mapGetFi(fsm->mapi) : NULL);
|
||||
struct mapi * mapi = fsm->mapi;
|
||||
return (mapi ? mapi->fi : NULL);
|
||||
}
|
||||
|
||||
int fsmGetIndex(FSM_t fsm) {
|
||||
return (fsm ? mapGetIndex(fsm->mapi) : -1);
|
||||
struct mapi * mapi = fsm->mapi;
|
||||
return (mapi ? mapi->isave : -1);
|
||||
}
|
||||
|
||||
fileAction fsmAction(FSM_t fsm,
|
||||
/*@out@*/ const char ** osuffix, /*@out@*/ const char ** nsuffix)
|
||||
{
|
||||
const struct cpioFileMapping * map = fsm->map;
|
||||
TFI_t fi = fsmGetFi(fsm);
|
||||
int i = fsmGetIndex(fsm);
|
||||
|
||||
fileAction action = FA_UNKNOWN;
|
||||
|
||||
if (map && fi && i >= 0 && i < fi->fc) {
|
||||
if (fsm->map && fi && i >= 0 && i < fi->fc) {
|
||||
action = fi->actions[i];
|
||||
if (osuffix) *osuffix = NULL;
|
||||
if (nsuffix) *nsuffix = NULL;
|
||||
|
|
@ -1814,24 +1793,23 @@ exit:
|
|||
|
||||
/**
|
||||
* Write next item to payload stream.
|
||||
* @param ts transaction set
|
||||
* @param fi transaction element file info
|
||||
* @param cfd payload file handle
|
||||
* @param st stat info for item
|
||||
* @param map mapping name and flags for item
|
||||
* @retval sizep address of no. bytes written
|
||||
* @param writeData should data be written?
|
||||
* @return 0 on success
|
||||
*/
|
||||
static int writeFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
||||
const struct stat * st, const void * map, /*@out@*/ size_t * sizep,
|
||||
static int writeFile(FSM_t fsm, const struct stat * st, /*@out@*/ size_t * sizep,
|
||||
int writeData)
|
||||
/*@modifies cfd, *sizep @*/
|
||||
/*@modifies fsm->cfd, *sizep @*/
|
||||
{
|
||||
const char * fsPath = mapFsPath(map, NULL, NULL, NULL);
|
||||
const rpmTransactionSet ts = fsmGetTs(fsm);
|
||||
TFI_t fi = fsmGetFi(fsm);
|
||||
|
||||
const char * fsPath = mapFsPath(fsm->map, NULL, NULL, NULL);
|
||||
const char * archivePath = NULL;
|
||||
const char * fsmPath = !mapFlags(map, CPIO_MAP_PATH)
|
||||
? fsPath : (archivePath = mapArchivePath(map));
|
||||
const char * fsmPath = !fsmFlags(fsm, CPIO_MAP_PATH)
|
||||
? fsPath : (archivePath = mapArchivePath(fsm->map));
|
||||
struct cpioCrcPhysicalHeader hdr;
|
||||
char buf[8192], symbuf[2048];
|
||||
dev_t num;
|
||||
|
|
@ -1840,15 +1818,16 @@ static int writeFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
|||
mode_t st_mode = st->st_mode;
|
||||
uid_t st_uid = st->st_uid;
|
||||
gid_t st_gid = st->st_gid;
|
||||
size_t size, amount = 0;
|
||||
size_t amount = 0;
|
||||
size_t size;
|
||||
int rc;
|
||||
|
||||
if (mapFlags(map, CPIO_MAP_MODE))
|
||||
st_mode = (st_mode & S_IFMT) | mapFinalMode(map);
|
||||
if (mapFlags(map, CPIO_MAP_UID))
|
||||
st_uid = mapFinalUid(map);
|
||||
if (mapFlags(map, CPIO_MAP_GID))
|
||||
st_gid = mapFinalGid(map);
|
||||
if (fsmFlags(fsm, CPIO_MAP_MODE))
|
||||
st_mode = (st_mode & S_IFMT) | mapFinalMode(fsm->map);
|
||||
if (fsmFlags(fsm, CPIO_MAP_UID))
|
||||
st_uid = mapFinalUid(fsm->map);
|
||||
if (fsmFlags(fsm, CPIO_MAP_GID))
|
||||
st_gid = mapFinalGid(fsm->map);
|
||||
|
||||
if (!writeData || S_ISDIR(st_mode)) {
|
||||
st_size = 0;
|
||||
|
|
@ -1883,12 +1862,12 @@ static int writeFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
|||
num = strlen(fsmPath) + 1; SET_NUM_FIELD(hdr.namesize, num, buf);
|
||||
memcpy(hdr.checksum, "00000000", 8);
|
||||
|
||||
if ((rc = safewrite(cfd, &hdr, PHYS_HDR_SIZE)) != PHYS_HDR_SIZE)
|
||||
if ((rc = safewrite(fsm->cfd, &hdr, PHYS_HDR_SIZE)) != PHYS_HDR_SIZE)
|
||||
goto exit;
|
||||
if ((rc = safewrite(cfd, fsmPath, num)) != num)
|
||||
if ((rc = safewrite(fsm->cfd, fsmPath, num)) != num)
|
||||
goto exit;
|
||||
size = PHYS_HDR_SIZE + num;
|
||||
if ((rc = padoutfd(cfd, &size, 4)))
|
||||
if ((rc = padoutfd(fsm->cfd, &size, 4)))
|
||||
goto exit;
|
||||
|
||||
if (writeData && S_ISREG(st_mode)) {
|
||||
|
|
@ -1938,7 +1917,7 @@ static int writeFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
|||
}
|
||||
}
|
||||
|
||||
if ((rc = safewrite(cfd, b, amount)) != amount) {
|
||||
if ((rc = safewrite(fsm->cfd, b, amount)) != amount) {
|
||||
int olderrno = errno;
|
||||
Fclose(datafd);
|
||||
errno = olderrno;
|
||||
|
|
@ -1956,13 +1935,13 @@ static int writeFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
|||
|
||||
Fclose(datafd);
|
||||
} else if (writeData && S_ISLNK(st_mode)) {
|
||||
if ((rc = safewrite(cfd, symbuf, amount)) != amount)
|
||||
if ((rc = safewrite(fsm->cfd, symbuf, amount)) != amount)
|
||||
goto exit;
|
||||
size += amount;
|
||||
}
|
||||
|
||||
/* this is a noop for most file types */
|
||||
if ((rc = padoutfd(cfd, &size, 4)))
|
||||
if ((rc = padoutfd(fsm->cfd, &size, 4)))
|
||||
goto exit;
|
||||
|
||||
if (sizep)
|
||||
|
|
@ -1982,45 +1961,32 @@ exit:
|
|||
|
||||
/**
|
||||
* Write set of linked files to payload stream.
|
||||
* @param ts transaction set
|
||||
* @param fi transaction element file info
|
||||
* @param cfd payload file handle
|
||||
* @param hlink set of linked files
|
||||
* @retval sizep address of no. bytes written
|
||||
* @retval failedFile on error, file name that failed
|
||||
* @return 0 on success
|
||||
*/
|
||||
static int writeLinkedFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
||||
const struct hardLink * hlink, /*@out@*/size_t * sizep,
|
||||
/*@out@*/const char ** failedFile)
|
||||
/*@modifies cfd, *sizep, *failedFile @*/
|
||||
static int writeLinkedFile(FSM_t fsm,
|
||||
const struct hardLink * hlink, /*@out@*/size_t * sizep)
|
||||
/*@modifies fsm->cfd, *sizep, *fsm->failedFile @*/
|
||||
{
|
||||
const void * map = NULL;
|
||||
size_t total = 0;
|
||||
size_t size;
|
||||
int rc = 0;
|
||||
int i;
|
||||
|
||||
for (i = hlink->nlink - 1; i > hlink->linksLeft; i--) {
|
||||
map = hlink->fileMaps[i];
|
||||
if ((rc = writeFile(ts, fi, cfd, &hlink->sb, map, &size, 0)) != 0) {
|
||||
if (failedFile && *failedFile == NULL)
|
||||
*failedFile = mapFsPath(map, NULL, NULL, NULL);
|
||||
fsm->map = hlink->fileMaps[i];
|
||||
if ((rc = writeFile(fsm, &hlink->sb, &size, 0)) != 0)
|
||||
goto exit;
|
||||
}
|
||||
|
||||
total += size;
|
||||
|
||||
map = mapFree(map);
|
||||
fsm->map = mapFree(fsm->map);
|
||||
}
|
||||
|
||||
i = hlink->linksLeft;
|
||||
map = hlink->fileMaps[i];
|
||||
if ((rc = writeFile(ts, fi, cfd, &hlink->sb, map, &size, 1))) {
|
||||
fsm->map = hlink->fileMaps[i];
|
||||
if ((rc = writeFile(fsm, &hlink->sb, &size, 1))) {
|
||||
if (sizep)
|
||||
*sizep = total;
|
||||
if (failedFile && *failedFile == NULL)
|
||||
*failedFile = mapFsPath(map, NULL, NULL, NULL);
|
||||
goto exit;
|
||||
}
|
||||
total += size;
|
||||
|
|
@ -2031,40 +1997,38 @@ static int writeLinkedFile(const rpmTransactionSet ts, TFI_t fi, FD_t cfd,
|
|||
rc = 0;
|
||||
|
||||
exit:
|
||||
map = mapFree(map);
|
||||
if (rc && fsm->failedFile && *fsm->failedFile == NULL)
|
||||
*fsm->failedFile = mapFsPath(fsm->map, NULL, NULL, NULL);
|
||||
fsm->map = mapFree(fsm->map);
|
||||
return rc;
|
||||
}
|
||||
|
||||
int cpioBuildArchive(const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
||||
unsigned int * archiveSize, const char ** failedFile)
|
||||
int cpioBuildArchive(FSM_t fsm)
|
||||
{
|
||||
void * mapi = mapInitIterator(ts, fi);
|
||||
const void * map;
|
||||
/*@-fullinitblock@*/
|
||||
struct hardLink hlinkList = { NULL };
|
||||
/*@=fullinitblock@*/
|
||||
struct stat * st = (struct stat *) &hlinkList.sb;
|
||||
struct hardLink * hlink;
|
||||
size_t totalsize = 0;
|
||||
size_t archiveSize = 0;
|
||||
size_t size;
|
||||
int rc;
|
||||
|
||||
hlinkList.next = NULL;
|
||||
|
||||
while ((map = mapNextIterator(mapi)) != NULL) {
|
||||
const char * fsPath;
|
||||
while ((fsm->map = mapNextIterator(fsm->mapi)) != NULL) {
|
||||
|
||||
fsPath = mapFsPath(map, NULL, NULL, NULL);
|
||||
fsm->path = mapFsPath(fsm->map, NULL, NULL, NULL);
|
||||
|
||||
if (mapFlags(map, CPIO_FOLLOW_SYMLINKS))
|
||||
rc = Stat(fsPath, st);
|
||||
if (fsmFlags(fsm, CPIO_FOLLOW_SYMLINKS))
|
||||
rc = Stat(fsm->path, st);
|
||||
else
|
||||
rc = Lstat(fsPath, st);
|
||||
rc = Lstat(fsm->path, st);
|
||||
|
||||
if (rc) {
|
||||
if (failedFile && *failedFile == NULL)
|
||||
*failedFile = fsPath;
|
||||
return CPIOERR_STAT_FAILED;
|
||||
|
||||
rc = CPIOERR_STAT_FAILED;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
if (!S_ISDIR(st->st_mode) && st->st_nlink > 1) {
|
||||
|
|
@ -2078,17 +2042,17 @@ int cpioBuildArchive(const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
|||
hlinkList.next = hlink;
|
||||
}
|
||||
|
||||
hlink->fileMaps[--hlink->linksLeft] = mapLink(map);
|
||||
hlink->fileMaps[--hlink->linksLeft] = mapLink(fsm->map);
|
||||
|
||||
if (hlink->linksLeft == 0) {
|
||||
struct hardLink * prev;
|
||||
rc = writeLinkedFile(ts, fi, cfd, hlink, &size, failedFile);
|
||||
rc = writeLinkedFile(fsm, hlink, &size);
|
||||
if (rc) {
|
||||
fsPath = _free(fsPath);
|
||||
return rc;
|
||||
fsm->path = _free(fsm->path);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
totalsize += size;
|
||||
archiveSize += size;
|
||||
|
||||
prev = &hlinkList;
|
||||
do {
|
||||
|
|
@ -2101,52 +2065,50 @@ int cpioBuildArchive(const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
|||
} while ((prev = prev->next) != NULL);
|
||||
}
|
||||
} else {
|
||||
if ((rc = writeFile(ts, fi, cfd, st, map, &size, 1))) {
|
||||
if (failedFile && *failedFile == NULL)
|
||||
*failedFile = fsPath;
|
||||
return rc;
|
||||
}
|
||||
|
||||
totalsize += size;
|
||||
if ((rc = writeFile(fsm, st, &size, 1)))
|
||||
goto exit;
|
||||
archiveSize += size;
|
||||
}
|
||||
fsPath = _free(fsPath);
|
||||
fsm->path = _free(fsm->path);
|
||||
}
|
||||
mapi = mapFreeIterator(mapi);
|
||||
|
||||
rc = 0;
|
||||
while ((hlink = hlinkList.next) != NULL) {
|
||||
hlinkList.next = hlink->next;
|
||||
hlink->next = NULL;
|
||||
if (rc == 0) {
|
||||
rc = writeLinkedFile(ts, fi, cfd, hlink, &size, failedFile);
|
||||
totalsize += size;
|
||||
rc = writeLinkedFile(fsm, hlink, &size);
|
||||
archiveSize += size;
|
||||
}
|
||||
hlink = freeHardLink(hlink);
|
||||
}
|
||||
if (rc)
|
||||
return rc;
|
||||
goto exit;
|
||||
|
||||
{ struct cpioCrcPhysicalHeader hdr;
|
||||
memset(&hdr, '0', PHYS_HDR_SIZE);
|
||||
memcpy(hdr.magic, CPIO_NEWC_MAGIC, sizeof(hdr.magic));
|
||||
memcpy(hdr.nlink, "00000001", 8);
|
||||
memcpy(hdr.namesize, "0000000b", 8);
|
||||
if ((rc = safewrite(cfd, &hdr, PHYS_HDR_SIZE)) != PHYS_HDR_SIZE)
|
||||
return rc;
|
||||
if ((rc = safewrite(cfd, "TRAILER!!!", 11)) != 11)
|
||||
return rc;
|
||||
totalsize += PHYS_HDR_SIZE + 11;
|
||||
if ((rc = safewrite(fsm->cfd, &hdr, PHYS_HDR_SIZE)) != PHYS_HDR_SIZE)
|
||||
goto exit;
|
||||
if ((rc = safewrite(fsm->cfd, "TRAILER!!!", 11)) != 11)
|
||||
goto exit;
|
||||
archiveSize += PHYS_HDR_SIZE + 11;
|
||||
}
|
||||
|
||||
/* GNU cpio pads to 512 bytes here, but we don't. I'm not sure if
|
||||
it matters or not */
|
||||
|
||||
if ((rc = padoutfd(cfd, &totalsize, 4)))
|
||||
return rc;
|
||||
rc = padoutfd(fsm->cfd, &archiveSize, 4);
|
||||
|
||||
if (archiveSize) *archiveSize = totalsize;
|
||||
if (!rc && fsm->archiveSize) *fsm->archiveSize = archiveSize;
|
||||
|
||||
return 0;
|
||||
exit:
|
||||
if (rc && fsm->path && fsm->failedFile && *fsm->failedFile == NULL)
|
||||
*fsm->failedFile = xstrdup(fsm->path);
|
||||
fsm->path = _free(fsm->path);
|
||||
return rc;
|
||||
}
|
||||
|
||||
const char *const cpioStrerror(int rc)
|
||||
|
|
|
|||
10
lib/cpio.h
10
lib/cpio.h
|
|
@ -88,15 +88,11 @@ int cpioInstallArchive(FSM_t fsm)
|
|||
/** \ingroup payload
|
||||
* The RPM internal equivalent of the command line "cpio -o".
|
||||
*
|
||||
* @param ts transaction set
|
||||
* @param fi transaction element file info
|
||||
* @param cfd file handle
|
||||
* @retval failedFile (malloc'd) file name that caused failure (if any)
|
||||
* @param fsm file state machine data
|
||||
* @return 0 on success
|
||||
*/
|
||||
int cpioBuildArchive(const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
||||
unsigned int * archiveSize, /*@out@*/ const char ** failedFile)
|
||||
/*@modifies fileSystem, cfd, *archiveSize, *failedFile @*/;
|
||||
int cpioBuildArchive(FSM_t fsm)
|
||||
/*@modifies fileSystem, fsm @*/;
|
||||
|
||||
/** \ingroup payload
|
||||
* Return formatted error message on payload handling failure.
|
||||
|
|
|
|||
|
|
@ -438,7 +438,7 @@ static int installArchive(const rpmTransactionSet ts, TFI_t fi, int allFiles)
|
|||
cfd = Fdopen(fdDup(Fileno(alp->fd)), rpmio_flags);
|
||||
cfd = fdLink(cfd, "persist (installArchive");
|
||||
|
||||
rc = fsmSetup(fi->fsm, ts, fi, cfd, &failedFile);
|
||||
rc = fsmSetup(fi->fsm, ts, fi, cfd, NULL, &failedFile);
|
||||
rc = cpioInstallArchive(fi->fsm);
|
||||
saveerrno = errno; /* XXX FIXME: Fclose with libio destroys errno */
|
||||
Fclose(cfd);
|
||||
|
|
@ -540,7 +540,7 @@ static int installSources(const rpmTransactionSet ts, TFI_t fi,
|
|||
if (fi->fflags[i] & RPMFILE_SPECFILE) break;
|
||||
|
||||
if (i == fi->fc) {
|
||||
/* find the spec file by name */
|
||||
/* Find the spec file by name. */
|
||||
for (i = 0; i < fi->fc; i++) {
|
||||
const char * t = fi->apath[i];
|
||||
t += strlen(fi->apath[i]) - 5;
|
||||
|
|
@ -687,6 +687,10 @@ int rpmInstallSourcePackage(const char * rootDir, FD_t fd,
|
|||
fi->fgids[i] = fi->gid;
|
||||
}
|
||||
|
||||
for (i = 0; i < fi->fc; i++) {
|
||||
fi->actions[i] = FA_CREATE;
|
||||
}
|
||||
|
||||
rpmBuildFileList(fi->h, &fi->apath, NULL);
|
||||
|
||||
rpmInstallLoadMacros(fi->h);
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@ typedef enum fileStage_e {
|
|||
FSM_UNDO = 5,
|
||||
FSM_COMMIT = 6,
|
||||
|
||||
FSM_INSTALL = 7,
|
||||
FSM_ERASE = 8,
|
||||
FSM_BUILD = 9,
|
||||
|
||||
FSM_CREATE = _fi(17),
|
||||
FSM_MAP = _fi(18),
|
||||
FSM_MKDIRS = _fi(19),
|
||||
|
|
@ -237,7 +241,7 @@ int pkgActions(const rpmTransactionSet ts, TFI_t fi, fileStage a);
|
|||
* @return 0 on success
|
||||
*/
|
||||
int fsmSetup(FSM_t fsm, const rpmTransactionSet ts, const TFI_t fi, FD_t cfd,
|
||||
const char ** failedFile);
|
||||
unsigned int * archiveSize, const char ** failedFile);
|
||||
|
||||
/**
|
||||
* @return 0 on success
|
||||
|
|
|
|||
120
po/rpm.pot
120
po/rpm.pot
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2001-02-01 18:39-0500\n"
|
||||
"POT-Creation-Date: 2001-02-02 09:58-0500\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -1472,7 +1472,7 @@ msgstr ""
|
|||
msgid "no tar files given for build"
|
||||
msgstr ""
|
||||
|
||||
#: build/build.c:114 build/pack.c:377
|
||||
#: build/build.c:114 build/pack.c:387
|
||||
msgid "Unable to open temp file.\n"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1662,7 +1662,7 @@ msgstr ""
|
|||
msgid "Could not open %%files file %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1461 build/pack.c:113
|
||||
#: build/files.c:1461 build/pack.c:123
|
||||
#, c-format
|
||||
msgid "line: %s\n"
|
||||
msgstr ""
|
||||
|
|
@ -1729,126 +1729,126 @@ msgstr ""
|
|||
msgid "Could not canonicalize hostname: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:56
|
||||
#: build/pack.c:67
|
||||
#, c-format
|
||||
msgid "create archive failed on file %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:79
|
||||
#: build/pack.c:89
|
||||
#, c-format
|
||||
msgid "cpio_copy write failed: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:86
|
||||
#: build/pack.c:96
|
||||
#, c-format
|
||||
msgid "cpio_copy read failed: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:170
|
||||
#: build/pack.c:180
|
||||
#, c-format
|
||||
msgid "Could not open PreIn file: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:177
|
||||
#: build/pack.c:187
|
||||
#, c-format
|
||||
msgid "Could not open PreUn file: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:184
|
||||
#: build/pack.c:194
|
||||
#, c-format
|
||||
msgid "Could not open PostIn file: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:191
|
||||
#: build/pack.c:201
|
||||
#, c-format
|
||||
msgid "Could not open PostUn file: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:199
|
||||
#: build/pack.c:209
|
||||
#, c-format
|
||||
msgid "Could not open VerifyScript file: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:214
|
||||
#: build/pack.c:224
|
||||
#, c-format
|
||||
msgid "Could not open Trigger script file: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:240
|
||||
#: build/pack.c:250
|
||||
#, c-format
|
||||
msgid "readRPM: open %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:250
|
||||
#: build/pack.c:260
|
||||
#, c-format
|
||||
msgid "readRPM: read %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:271
|
||||
#: build/pack.c:281
|
||||
#, c-format
|
||||
msgid "readRPM: %s is not an RPM package\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:277
|
||||
#: build/pack.c:287
|
||||
#, c-format
|
||||
msgid "readRPM: reading header from %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:389
|
||||
#: build/pack.c:399
|
||||
msgid "Bad CSA data\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:430
|
||||
#, c-format
|
||||
msgid "Generating signature: %d\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:440
|
||||
#, c-format
|
||||
msgid "Generating signature: %d\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:450
|
||||
#, c-format
|
||||
msgid "Could not open %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:477
|
||||
#: build/pack.c:487
|
||||
#, c-format
|
||||
msgid "Unable to write package: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:492
|
||||
#: build/pack.c:502
|
||||
#, c-format
|
||||
msgid "Unable to open sigtarget %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:502
|
||||
#: build/pack.c:512
|
||||
#, c-format
|
||||
msgid "Unable to read header from %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:516
|
||||
#: build/pack.c:526
|
||||
#, c-format
|
||||
msgid "Unable to write header to %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:526
|
||||
#: build/pack.c:536
|
||||
#, c-format
|
||||
msgid "Unable to read payload from %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:532
|
||||
#: build/pack.c:542
|
||||
#, c-format
|
||||
msgid "Unable to write payload to %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:559
|
||||
#: build/pack.c:569
|
||||
#, c-format
|
||||
msgid "Wrote: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:624
|
||||
#: build/pack.c:634
|
||||
#, c-format
|
||||
msgid "Could not generate output filename for package %s: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/pack.c:641
|
||||
#: build/pack.c:651
|
||||
#, c-format
|
||||
msgid "cannot create %s: %s\n"
|
||||
msgstr ""
|
||||
|
|
@ -2185,89 +2185,89 @@ msgstr ""
|
|||
msgid "line %d: Bad %s number: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:305
|
||||
msgid "========= Directories not explictly included in package:\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:307
|
||||
#, c-format
|
||||
msgid "%9d %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:450 lib/install.c:829
|
||||
#: lib/cpio.c:343 lib/install.c:833
|
||||
#, c-format
|
||||
msgid " file: %s%s action: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:485
|
||||
#: lib/cpio.c:378
|
||||
#, c-format
|
||||
msgid "%s: cannot remove %s - directory not empty\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:490
|
||||
#: lib/cpio.c:383
|
||||
#, c-format
|
||||
msgid "%s rmdir of %s failed: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:501
|
||||
#: lib/cpio.c:394
|
||||
#, c-format
|
||||
msgid "%s removal of %s failed: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:516
|
||||
#: lib/cpio.c:409
|
||||
#, c-format
|
||||
msgid "%s: %s saved as %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:522
|
||||
#: lib/cpio.c:415
|
||||
#, c-format
|
||||
msgid "%s rename of %s to %s failed: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:890
|
||||
#: lib/cpio.c:508
|
||||
msgid "========= Directories not explictly included in package:\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:510
|
||||
#, c-format
|
||||
msgid "%9d %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:861
|
||||
#, c-format
|
||||
msgid "%s saved as %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:1414
|
||||
#: lib/cpio.c:1391
|
||||
#, c-format
|
||||
msgid "%s created as %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2162
|
||||
#: lib/cpio.c:2124
|
||||
#, c-format
|
||||
msgid "(error 0x%x)"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2165
|
||||
#: lib/cpio.c:2127
|
||||
msgid "Bad magic"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2166
|
||||
#: lib/cpio.c:2128
|
||||
msgid "Bad/unreadable header"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2187
|
||||
#: lib/cpio.c:2149
|
||||
msgid "Header size too big"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2188
|
||||
#: lib/cpio.c:2150
|
||||
msgid "Unknown file type"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2189
|
||||
#: lib/cpio.c:2151
|
||||
msgid "Missing hard link"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2190
|
||||
#: lib/cpio.c:2152
|
||||
msgid "MD5 sum mismatch"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2191
|
||||
#: lib/cpio.c:2153
|
||||
msgid "Internal error"
|
||||
msgstr ""
|
||||
|
||||
#: lib/cpio.c:2200
|
||||
#: lib/cpio.c:2162
|
||||
msgid " failed - "
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2677,17 +2677,17 @@ msgstr ""
|
|||
msgid "source package expected, binary found\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/install.c:718 lib/uninstall.c:24
|
||||
#: lib/install.c:722 lib/uninstall.c:24
|
||||
#, c-format
|
||||
msgid "%s: %s-%s-%s has %d files, test = %d\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/install.c:785 lib/install.c:886 lib/uninstall.c:62 lib/uninstall.c:83
|
||||
#: lib/install.c:789 lib/install.c:890 lib/uninstall.c:62 lib/uninstall.c:83
|
||||
#, c-format
|
||||
msgid "%s: running %s script(s) (if any)\n"
|
||||
msgstr ""
|
||||
|
||||
#: lib/install.c:792
|
||||
#: lib/install.c:796
|
||||
msgid "skipping %s-%s-%s install, %%pre scriptlet failed rc %d\n"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue