diff options
| author | Davidlohr Bueso <dave@gnu.org> | 2010-11-16 10:47:35 -0300 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2010-11-23 21:06:49 +0100 |
| commit | 8abcf2900297c6d53ead867c42f7c1688e8d52ca (patch) | |
| tree | 77e2d666cd76d9d4c37e1c1864415c1e52d37926 /mount/Makefile.am | |
| parent | e8fc977aba09ddbd89b25276fd777c3f0eef9299 (diff) | |
| download | util-linux-old-8abcf2900297c6d53ead867c42f7c1688e8d52ca.tar.gz | |
lib: [strutils] general purpose string handling functions
This patch replaces a few functions used throughout the source:
* Renames getnum (from schedutils) to strtol_or_err
* Moves strtosize (from lib/strtosize.c)
* Moves xstrncpy (from include/xstrncpy.h)
* Adds strnlen, strnchr and strndup if not available (remove it from libmount utils)
A few Makefile.am files were modified to compile accordingly along with trivial renaming
in schedutils source code.
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Diffstat (limited to 'mount/Makefile.am')
| -rw-r--r-- | mount/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mount/Makefile.am b/mount/Makefile.am index 235cceb0..36b06e32 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -28,12 +28,12 @@ cflags_common = $(AM_CFLAGS) ldflags_static = -all-static mount_SOURCES = mount.c $(srcs_mount) $(top_srcdir)/lib/setproctitle.c \ - $(top_srcdir)/lib/strtosize.c + $(top_srcdir)/lib/strutils.c mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) mount_LDADD = $(ldadd_common) -umount_SOURCES = umount.c $(srcs_mount) $(top_srcdir)/lib/strtosize.c +umount_SOURCES = umount.c $(srcs_mount) $(top_srcdir)/lib/strutils.c umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) umount_LDADD = $(ldadd_common) @@ -45,7 +45,7 @@ swapon_CFLAGS = $(cflags_common) swapon_LDADD = $(ldadd_common) losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h \ - $(top_srcdir)/lib/strtosize.c + $(top_srcdir)/lib/strutils.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_static_LDADD = |