Attachment #15104 for bug #28095

View | Details | Raw Unified | Return to bug 28095
Collapse All | Expand All




               /*
                * check if this file meets user specified options match.
                */
               if (sel_chk(arcn) != 0) {
                       ftree_notsel(arcn);
                       continue;
               }
               fd = -1;
               if (uflag) {
                       /*

               /*
                * check if this file meets user specified options
                */
               if (sel_chk(arcn) != 0) {
                       ftree_notsel(arcn);
                       continue;
               }
               /*
                * if there is already a file in the destination directory with
                * the same name and it is newer, skip the one stored on the

Lines 157-162 Link Here

(-)pax/extern.h Tue Jun 12 02:48:42 2001 (+1 lines)
157	int ftree_start __P((void));	157	int ftree_start __P((void));
158	int ftree_add __P((register char *));	158	int ftree_add __P((register char *));
159	void ftree_sel __P((register ARCHD *));	159	void ftree_sel __P((register ARCHD *));
		160	void ftree_notsel __P((register ARCHD *));
160	void ftree_chk __P((void));	161	void ftree_chk __P((void));
161	int next_file __P((register ARCHD *));	162	int next_file __P((register ARCHD *));
162		163




}

/*
 * ftree_notsel()
 *      this entry has been skipped by pax.
 */

#if __STDC__
void
ftree_notsel(register ARCHD *arcn)
#else
void
ftree_notsel(arcn)
       register ARCHD *arcn;
#endif
{
       if (ftent != NULL)
               (void)fts_set(ftsp, ftent, FTS_SKIP);
}

/*
 * ftree_chk()
 *     called at end on pax execution. Prints all those file args that did not
 *     have a selected member (reference count still 0)

Return to bug 28095

Lines 395-402 Link Here

(-)pax/ar_subs.c Tue Jun 12 02:53:37 2001 (-3 / +6 lines)
395	/*	395	/*
396	* check if this file meets user specified options match.	396	* check if this file meets user specified options match.
397	*/	397	*/
398	if (sel_chk(arcn) != 0)	398	if (sel_chk(arcn) != 0) {
		399	ftree_notsel(arcn);
399	continue;	400	continue;
		401	}
400	fd = -1;	402	fd = -1;
401	if (uflag) {	403	if (uflag) {
402	/*	404	/*
Lines 791-799 Link Here
791	/*	793	/*
792	* check if this file meets user specified options	794	* check if this file meets user specified options
793	*/	795	*/
794	if (sel_chk(arcn) != 0)	796	if (sel_chk(arcn) != 0) {
		797	ftree_notsel(arcn);
795	continue;	798	continue;
796		799	}
797	/*	800	/*
798	* if there is already a file in the destination directory with	801	* if there is already a file in the destination directory with
799	* the same name and it is newer, skip the one stored on the	802	* the same name and it is newer, skip the one stored on the

Lines 234-239 Link Here

(-)pax/ftree.c Tue Jun 12 02:48:21 2001 (+18 lines)
234	}	234	}
235		235
236	/*	236	/*
		237	* ftree_notsel()
		238	* this entry has been skipped by pax.
		239	*/
		240
		241	#if __STDC__
		242	void
		243	ftree_notsel(register ARCHD *arcn)
		244	#else
		245	void
		246	ftree_notsel(arcn)
		247	register ARCHD *arcn;
		248	#endif
		249	{
		250	if (ftent != NULL)
		251	(void)fts_set(ftsp, ftent, FTS_SKIP);
		252	}
		253
		254	/*
237	* ftree_chk()	255	* ftree_chk()
238	* called at end on pax execution. Prints all those file args that did not	256	* called at end on pax execution. Prints all those file args that did not
239	* have a selected member (reference count still 0)	257	* have a selected member (reference count still 0)