diff options
| author | Alejandro Colomar <alx@kernel.org> | 2023-08-25 11:29:00 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2023-09-10 14:12:54 +0200 |
| commit | 1c330177f0575c735f95a8b5a46723b4f209c5bb (patch) | |
| tree | d8a936e91d2389b73c8b4d7721ae64c0e4255eda | |
| parent | 014536f5d55df33fc032d7a14d9f9d975d569722 (diff) | |
lib, libmisc: Move source files to lib (where their headers were)
Scripted change:
$ find lib/ -type f \
| grep '\.h$' \
| sed 's,lib/,libmisc/,' \
| sed 's,\.h$,.c,' \
| xargs find 2>/dev/null \
| xargs mv -t lib/;
Plus updating the Makefiles.
Closes: <https://github.com/shadow-maint/shadow/issues/791>
Closes: <https://bugs.gentoo.org/912446>
Link: <https://github.com/shadow-maint/shadow/issues/763#issuecomment-1664383425>
Link: <https://github.com/shadow-maint/shadow/pull/776>
Link: <https://github.com/shadow-maint/shadow/commit/d0518cc250afeaceb772a7f50a900cfc9b3ab937>
Reported-by: Christian Bricart <christian@bricart.de>
Reported-by: Robert Marmorstein <robert@marmorstein.org>
Cc: Sam James <sam@gentoo.org>
[ jubalh tested the openSUSE package ]
Tested-by: Michael Vetter <jubalh@iodoru.org>
Acked-by: Michael Vetter <jubalh@iodoru.org>
[ Robert F. tested the Gentoo package ]
Tested-by: Robert Förster <Dessa@gmake.de>
Cc: David Seifert <soap@gentoo.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | lib/Makefile.am | 10 | ||||
| -rw-r--r-- | lib/alloc.c (renamed from libmisc/alloc.c) | 0 | ||||
| -rw-r--r-- | lib/bit.c (renamed from libmisc/bit.c) | 0 | ||||
| -rw-r--r-- | lib/mempcpy.c (renamed from libmisc/mempcpy.c) | 0 | ||||
| -rw-r--r-- | lib/stpecpy.c (renamed from libmisc/stpecpy.c) | 0 | ||||
| -rw-r--r-- | lib/stpeprintf.c (renamed from libmisc/stpeprintf.c) | 0 | ||||
| -rw-r--r-- | libmisc/Makefile.am | 9 |
7 files changed, 10 insertions, 9 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index c8d6dd5f..7f3f7f63 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,6 +14,10 @@ libshadow_la_CPPFLAGS += -I$(top_srcdir) libshadow_la_CFLAGS = $(LIBBSD_CFLAGS) libshadow_la_SOURCES = \ + alloc.c \ + alloc.h \ + bit.c \ + bit.h \ commonio.c \ commonio.h \ defines.h \ @@ -34,6 +38,8 @@ libshadow_la_SOURCES = \ groupio.h \ gshadow.c \ lockpw.c \ + mempcpy.c \ + mempcpy.h \ nss.c \ nscd.c \ nscd.h \ @@ -67,6 +73,10 @@ libshadow_la_SOURCES = \ shadowio.h \ shadowmem.c \ spawn.c \ + stpecpy.c \ + stpecpy.h \ + stpeprintf.c \ + stpeprintf.h \ write_full.c if WITH_TCB diff --git a/libmisc/alloc.c b/lib/alloc.c index 962f45a1..962f45a1 100644 --- a/libmisc/alloc.c +++ b/lib/alloc.c diff --git a/libmisc/bit.c b/lib/bit.c index 1ffc6dc9..1ffc6dc9 100644 --- a/libmisc/bit.c +++ b/lib/bit.c diff --git a/libmisc/mempcpy.c b/lib/mempcpy.c index 14a09613..14a09613 100644 --- a/libmisc/mempcpy.c +++ b/lib/mempcpy.c diff --git a/libmisc/stpecpy.c b/lib/stpecpy.c index faa02d69..faa02d69 100644 --- a/libmisc/stpecpy.c +++ b/lib/stpecpy.c diff --git a/libmisc/stpeprintf.c b/lib/stpeprintf.c index f3238eaf..f3238eaf 100644 --- a/libmisc/stpeprintf.c +++ b/lib/stpeprintf.c diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am index 10bf1537..5eba4650 100644 --- a/libmisc/Makefile.am +++ b/libmisc/Makefile.am @@ -16,12 +16,8 @@ libmisc_la_SOURCES = \ addgrps.c \ age.c \ agetpass.c \ - alloc.c \ - ../lib/alloc.h \ audit_help.c \ basename.c \ - bit.c \ - ../lib/bit.h \ chkname.c \ chkname.h \ chowndir.c \ @@ -53,7 +49,6 @@ libmisc_la_SOURCES = \ list.c \ loginprompt.c \ mail.c \ - mempcpy.c \ motd.c \ myname.c \ obscure.c \ @@ -71,10 +66,6 @@ libmisc_la_SOURCES = \ setugid.c \ setupenv.c \ shell.c \ - stpecpy.c \ - ../lib/stpecpy.h \ - stpeprintf.c \ - ../lib/stpeprintf.h \ strtoday.c \ sub.c \ sulog.c \ |