cp: Refactor the core logic.
ClosedPublic
Actions

Authored by des on Dec 13 2023, 11:24 PM.

Details

Reviewers

allanjude
kevans

Group Reviewers

Klara

Commits

rGd002316fd7bf: cp: Refactor the core logic.

Summary

Rewrite copy_file() so the lflag and sflag are handled as early as possible instead of constantly checking that they're not set and then handling them at the end. This also opens the door to changing the failure logic at some future point (for instance, we might decide to fall back to copying if errno indicates that the file system does not support links).

MFC after: 1 week
Sponsored by: Klara, Inc.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 54940
Build 51829: arc lint + arc unit

Event Timeline

des created this revision.Dec 13 2023, 11:24 PM

Herald added a subscriber: imp. · View Herald TranscriptDec 13 2023, 11:24 PM

des requested review of this revision.Dec 13 2023, 11:24 PM

Harbormaster completed remote builds in B54940: Diff 131422.Dec 13 2023, 11:24 PM

reviewed-by: allanjude

This revision is now accepted and ready to land.Dec 13 2023, 11:30 PM

That's a big improvement, thanks

Closed by commit rGd002316fd7bf: cp: Refactor the core logic. (authored by des). · Explain WhyDec 13 2023, 11:42 PM

This revision was automatically updated to reflect the committed changes.

des added a commit: rGd002316fd7bf: cp: Refactor the core logic..

des mentioned this in rGd514cadacc50: cp: Add tests for hard link case..Jan 17 2024, 6:28 PM

des mentioned this in rG006017419bea: cp: Add tests for hard link case..

Revision Contents
Changeset List

Path

Size

bin/

cp/

utils.c

121 lines

Diff 131422

View Options

bin/cp/utils.c

	# $FreeBSD$			# $FreeBSD$

	SSP_CFLAGS=			SSP_CFLAGS=

	NO_WMISSING_VARIABLE_DECLARATIONS=			NO_WMISSING_VARIABLE_DECLARATIONS=

	.include <src.opts.mk>			.include <src.opts.mk>

	.if !defined(BUILDING_TESTS)			.if !defined(BUILDING_TESTS)

	OBJS+= Scrt1.o crt1.o gcrt1.o			OBJS+= Scrt1.o crt1.o gcrt1.o
	OBJS+= crtbegin.o crtbeginS.o crtbeginT.o			OBJS+= crtbegin.o crtbeginS.o crtbeginT.o
	OBJS+= crtend.o crtendS.o			OBJS+= crtend.o crtendS.o
	OBJS+= crti.o crtn.o			OBJS+= crti.o crtn.o

	CRT1OBJS+= crtbrand.o ignore_init_note.o			CRT1OBJS+= crtbrand.o feature_note.o ignore_init_note.o

	ACFLAGS+= -DLOCORE			ACFLAGS+= -DLOCORE

	CFLAGS+= -fno-asynchronous-unwind-tables			CFLAGS+= -fno-asynchronous-unwind-tables
	CFLAGS+= -fno-omit-frame-pointer			CFLAGS+= -fno-omit-frame-pointer
	CFLAGS+= -I${.CURDIR:H}/common \			CFLAGS+= -I${.CURDIR:H}/common \
	-I${SRCTOP}/lib/libc/include			-I${SRCTOP}/lib/libc/include

	CFLAGS_CRTS= -DSHARED ${PICFLAG}			CFLAGS_CRTS= -DSHARED ${PICFLAG}

	FILES= ${OBJS}			FILES= ${OBJS}
	FILESMODE= ${LIBMODE}			FILESMODE= ${LIBMODE}
	FILESOWN= ${LIBOWN}			FILESOWN= ${LIBOWN}
	FILESGRP= ${LIBGRP}			FILESGRP= ${LIBGRP}
	FILESDIR= ${LIBDIR}			FILESDIR= ${LIBDIR}
	# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.			# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
	.undef LIBRARIES_ONLY			.undef LIBRARIES_ONLY

	CLEANFILES+= ${OBJS} ${CRT1OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o			CLEANFILES+= ${OBJS} ${CRT1OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
				CLEANFILES+= crti_s.o

	crt1.o: crt1_c.o ${CRT1OBJS}			crt1.o: crt1_c.o ${CRT1OBJS}
	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}			${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
	.if ${MACHINE_ARCH} == "i386"			.if ${MACHINE_ARCH} == "i386"
	${OBJCOPY} --localize-symbol _start1 ${.TARGET}			${OBJCOPY} --localize-symbol _start1 ${.TARGET}
	.endif			.endif

	gcrt1_c.o: crt1_c.c			gcrt1_c.o: crt1_c.c
	Show All 18 Lines
	crtendS.o: crtend.c			crtendS.o: crtend.c

	crtbegin.o crtend.o crtbeginT.o:			crtbegin.o crtend.o crtbeginT.o:
	${CC} ${CFLAGS} -I${.CURDIR} -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}			${CC} ${CFLAGS} -I${.CURDIR} -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}

	crtbeginS.o crtendS.o:			crtbeginS.o crtendS.o:
	${CC} ${CFLAGS} -I${.CURDIR} ${CFLAGS_CRTS} -c -o ${.TARGET} \			${CC} ${CFLAGS} -I${.CURDIR} ${CFLAGS_CRTS} -c -o ${.TARGET} \
	${.ALLSRC:N*.h:[1]}			${.ALLSRC:N*.h:[1]}

				crti_s.o: crti.S
				${CC} ${CFLAGS} ${ACFLAGS} -c ${.ALLSRC:M*.S} -o ${.TARGET}

				crti.o: crti_s.o crtbrand.o
				jhbAuthorUnsubmitted Done Inline Actions Here we link crti_s.o (generated from per-arch crti.S) and crtbrand.o to build crti.o. This is then included in both shared libraries and executables. jhb: Here we link crti_s.o (generated from per-arch crti.S) and crtbrand.o to build crti.o. This is…
				${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}

	.endif			.endif

	.include "../Makefile.inc"			.include "../Makefile.inc"

cp: Refactor the core logic.ClosedPublicActions