src/usr.bin/make/suff.c - diff

Return to suff.c CVS log

Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/suff.c between version 1.23 and 1.24

version 1.23, 2000/03/14 19:00:32

version 1.24, 2000/03/26 15:51:31

Line 125

Lst searchPath; /* The path along which files of this suffix

* may be found */

int sNum; /* The suffix number */

int refCount; /* Reference count of list membership */

Lst parents; /* Suffixes we have a transformation to */

Lst children; /* Suffixes we have a transformation from */

Lst ref; /* List of lists this suffix is referenced */

Line 170

Line 169

static void SuffUnRef __P((ClientData, ClientData));

static void SuffFree __P((ClientData));

static void SuffInsert __P((Lst, Suff *));

static Suff *SuffRemove __P((Lst, Suff *));

static void SuffRemove __P((Lst, Suff *));

static Boolean SuffParseTransform __P((char *, Suff **, Suff **));

static int SuffRebuildGraph __P((ClientData, ClientData));

static int SuffAddSrc __P((ClientData, ClientData));

Line 342

Line 341

Lst l = (Lst) lp;

LstNode ln = Lst_Member(l, sp);

if (ln != NULL) {

if (ln != NULL)

Lst_Remove(l, ln);

((Suff *) sp)->refCount--;

}

/*-

Line 372

Line 369

if (s == emptySuff)

emptySuff = NULL;

#ifdef notdef

/* We don't delete suffixes in order, so we cannot use this */

if (s->refCount)

Punt("Internal error deleting suffix `%s' with refcount = %d", s->name,

s->refCount);

#endif

Lst_Destroy (s->ref, NOFREE);

Lst_Destroy (s->children, NOFREE);

Lst_Destroy (s->parents, NOFREE);

Line 391

Line 381

/*-

*-----------------------------------------------------------------------

* SuffRemove --

* Remove the suffix into the list

* Remove the suffix from the list

* Results:

* None

* Side Effects:

* The reference count for the suffix is decremented and the

* suffix is possibly freed

*-----------------------------------------------------------------------

static Suff *

static void

SuffRemove(l, s)

Lst l;

Suff *s;

{

SuffUnRef((ClientData) l, (ClientData) s);

#if 0

if (s->refCount == 0) {

SuffUnRef ((ClientData) sufflist, (ClientData) s);

SuffFree((ClientData) s);

s = NULL;

}

#endif

return (s);

}

/*-

Line 457

Line 432

printf("at end of list\n");

}

Lst_AtEnd (l, (ClientData)s);

s->refCount++;

Lst_AtEnd(s->ref, (ClientData) l);

} else if (s2->sNum != s->sNum) {

if (DEBUG(SUFF)) {

printf("before %s(%d)\n", s2->name, s2->sNum);

}

Lst_Insert(l, ln, (ClientData)s);

s->refCount++;

Lst_AtEnd(s->ref, (ClientData) l);

} else if (DEBUG(SUFF)) {

printf("already there\n");

Line 701

Line 674

}

* Remove the source from the target's children list. We check for a

* Remove the source from the target's children list.

* null return to handle a beanhead saying something like

* .c.o .c.o:

* We'll be called twice when the next target is seen, but .c and .o

* are only linked once...

s = SuffRemove(t->children, s);

SuffRemove(t->children, s);

* Remove the target from the source's parents list

if (s != NULL)

SuffRemove(s->parents, t);

} else if ((gn->type & OP_TRANSFORM) && DEBUG(SUFF)) {

printf("transformation %s complete\n", gn->name);

}

Line 829

Line 799

s->ref = Lst_Init();

s->sNum = sNum++;

s->flags = 0;

s->refCount = 0;

Lst_AtEnd(sufflist, (ClientData)s);

Line 1033

Line 1002

s2->parent = targ;

s2->node = NULL;

s2->suff = s;

s->refCount++;

s2->children = 0;

targ->children += 1;

Lst_AtEnd(ls->l, (ClientData)s2);

Line 1051

Line 1019

s2->parent = targ;

s2->node = NULL;

s2->suff = s;

s->refCount++;

s2->children = 0;

targ->children += 1;

Lst_AtEnd(ls->l, (ClientData)s2);

Line 1292

Line 1259

ret->file = estrdup(s->name);

ret->pref = targ->pref;

ret->suff = suff;

suff->refCount++;

ret->parent = targ;

ret->node = s;

ret->children = 0;

Line 1874

Line 1840

targ = (Src *)emalloc(sizeof (Src));

targ->file = estrdup(gn->name);

targ->suff = (Suff *)Lst_Datum(ln);

targ->suff->refCount++;

targ->node = gn;

targ->parent = (Src *)NULL;

targ->children = 0;

Line 1919

Line 1884

targ = (Src *)emalloc(sizeof (Src));

targ->file = estrdup(gn->name);

targ->suff = suffNull;

targ->suff->refCount++;

targ->node = gn;

targ->parent = (Src *)NULL;

targ->children = 0;

Line 2016

Line 1980

int savep = strlen(gn->path) - targ->suff->nameLen;

char savec;

if (gn->suffix)

gn->suffix->refCount--;

gn->suffix = targ->suff;

gn->suffix->refCount++;

savec = gn->path[savep];

gn->path[savep] = '\0';

Line 2037

Line 1998

* The .PREFIX gets the full path if the target has

* no known suffix.

if (gn->suffix)

gn->suffix->refCount--;

gn->suffix = NULL;

if ((ptr = strrchr(gn->path, '/')) != NULL)

Line 2055

Line 2014

* path to be the name so Dir_MTime won't go grovelling for

* it.

if (gn->suffix)

gn->suffix->refCount--;

gn->suffix = (targ == NULL) ? NULL : targ->suff;

if (gn->suffix)

gn->suffix->refCount++;

efree(gn->path);

gn->path = estrdup(gn->name);

}

Line 2122

Line 2077

for (src = bottom; src->parent != (Src *)NULL; src = src->parent) {

targ = src->parent;

if (src->node->suffix)

src->node->suffix->refCount--;

src->node->suffix = src->suff;

src->node->suffix->refCount++;

if (targ->node == NULL) {

targ->node = Targ_FindNode(targ->file, TARG_CREATE);

Line 2152

Line 2104

}

if (gn->suffix)

gn->suffix->refCount--;

gn->suffix = src->suff;

gn->suffix->refCount++;

* So Dir_MTime doesn't go questing for it...

Line 2252

Line 2201

Suff *s;

ln = Lst_Find(sufflist, SuffSuffHasNameP, (ClientData)LIBSUFF);

if (gn->suffix)

gn->suffix->refCount--;

if (ln != NULL) {

gn->suffix = s = (Suff *) Lst_Datum (ln);

gn->suffix->refCount++;

Arch_FindLib (gn, s->searchPath);

} else {

gn->suffix = NULL;

Line 2353

Line 2299

suffNull->ref = Lst_Init();

suffNull->sNum = sNum++;

suffNull->flags = SUFF_NULL;

suffNull->refCount = 1;

}

Line 2404

Line 2349

int flags;

int flag;

printf ("# `%s' [%d] ", s->name, s->refCount);

printf ("# `%s' ", s->name);

flags = s->flags;

if (flags) {