Restore Darling Specific Changes

This commit is contained in:
Thomas A 2023-01-31 12:09:00 -08:00
parent 390e64e423
commit d2bf69235e
3 changed files with 13 additions and 0 deletions

View File

@ -84,6 +84,11 @@ const char *gname;
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
#ifdef DARLING
// file ownership is pretty much a no-op under Darling at the moment,
// so let's just silently pretend that chown/chgrp always succeeds
return 0;
#else
FTS *ftsp; FTS *ftsp;
FTSENT *p; FTSENT *p;
int Hflag, Lflag, Pflag, Rflag, fflag, hflag, vflag; int Hflag, Lflag, Pflag, Rflag, fflag, hflag, vflag;
@ -248,6 +253,7 @@ main(int argc, char **argv)
if (errno) if (errno)
err(1, "fts_read"); err(1, "fts_read");
exit(rval); exit(rval);
#endif // DARLING
} }
void void

View File

@ -203,6 +203,9 @@ int opt_add(const char *);
int bad_opt(void); int bad_opt(void);
int pax_format_opt_add(char *); int pax_format_opt_add(char *);
int pax_opt(void); int pax_opt(void);
#ifdef DARLING
extern
#endif
char *chdname; char *chdname;
/* /*

View File

@ -161,6 +161,10 @@ int ford[] = {F_PAX, F_TAR, F_OTAR, F_CPIO, F_SCPIO, F_ACPIO, F_OCPIO, -1 };
*/ */
int havechd = 0; int havechd = 0;
#ifdef DARLING
char* chdname = NULL;
#endif
/* /*
* options() * options()
* figure out if we are pax, tar or cpio. Call the appropriate options * figure out if we are pax, tar or cpio. Call the appropriate options