Merge branch 'master' into nls

Conflicts:
	configure.ac
	pmap.c
	ps/Makefile.am

.gitignore

@@ -32,8 +32,8 @@ pkill
 pmap
 procps-ng-*.tar.gz
 proc/.depend
-proc/libprocfs.la
-proc/libprocfs.pc
+proc/libprocps.la
+proc/libprocps.pc
 proc/Makefile
 proc/Makefile.in
 ps/Makefile

Makefile.am

@@ -11,7 +11,7 @@ SUBDIRS = \
 	top
 
 AM_CFLAGS = -Iproc
-AM_LDFLAGS = ./proc/libprocfs.la
+AM_LDFLAGS = ./proc/libprocps.la
 
 sbin_PROGRAMS = \
 	sysctl

configure.ac

@@ -193,7 +193,7 @@ AC_CONFIG_FILES([
 	lib/Makefile
 	po/Makefile.in
 	proc/Makefile
-	proc/libprocfs.pc
+	proc/libprocps.pc
 	ps/Makefile
 	testsuite/Makefile
 	top/Makefile

pmap.c

@@ -160,6 +160,7 @@ static int one_proc(proc_t * p)
 	unsigned long total_shared = 0ul;
 	unsigned long total_private_readonly = 0ul;
 	unsigned long total_private_writeable = 0ul;
+    KLONG diff = 0;
 
 	char *cp2 = NULL;
 	unsigned long long rss = 0ull;
@@ -213,7 +214,7 @@ static int one_proc(proc_t * p)
 		char flags[32];
 		/* to clean up unprintables */
 		char *tmp;
-		unsigned KLONG start, end, diff = 0;
+		unsigned KLONG start, end;
 		unsigned long long file_offset, inode;
 		unsigned dev_major, dev_minor;
 		unsigned long long smap_value;
@@ -253,6 +254,7 @@ static int one_proc(proc_t * p)
 					/* reset some counters */
 					rss = shared_dirty = private_dirty =
 					    0ull;
+                    diff = 0;
 					continue;
 				}
 				/* Other keys */

proc/Makefile.am

@@ -1,27 +1,27 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 AM_CPPFLAGS = -include $(top_builddir)/config.h
 
-LIBPROCFS_CURRENT=0
-LIBPROCFS_REVISION=0
-LIBPROCFS_AGE=0
+LIBprocps_CURRENT=0
+LIBprocps_REVISION=0
+LIBprocps_AGE=0
 
-lib_LTLIBRARIES = libprocfs.la
+lib_LTLIBRARIES = libprocps.la
 
-libprocfs_ladir = $(ladir)
-libprocfs_la_LIBADD = $(LIB_KPARTS)
-libprocfs_la_LDFLAGS = \
+libprocps_ladir = $(ladir)
+libprocps_la_LIBADD = $(LIB_KPARTS)
+libprocps_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	$(all_libraries) \
-	-version-info $(LIBPROCFS_CURRENT):$(LIBPROCFS_REVISION):$(LIBPROCFS_AGE) \
+	-version-info $(LIBprocps_CURRENT):$(LIBprocps_REVISION):$(LIBprocps_AGE) \
 	-no-undefined \
-	-Wl,--version-script=$(top_srcdir)/proc/libprocfs.sym
+	-Wl,--version-script=$(top_srcdir)/proc/libprocps.sym
 
 EXTRA_DIST = library.map
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libprocfs.pc
+pkgconfig_DATA = libprocps.pc
 
-libprocfs_la_SOURCES = \
+libprocps_la_SOURCES = \
 	alloc.c \
 	alloc.h \
 	devname.c \
@@ -46,8 +46,8 @@ libprocfs_la_SOURCES = \
 	whattime.c \
 	whattime.h
 
-libprocfs_la_includedir = $(includedir)/proc/
-libprocfs_la_include_HEADERS =  \
+libprocps_la_includedir = $(includedir)/proc/
+libprocps_la_include_HEADERS =  \
 	alloc.h \
 	devname.h \
 	escape.h \

proc/libprocps.pc.in

@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libprocfs
+Name: libprocps
 Description: Library to control and query process state
 Version: @VERSION@
-Libs: -L${libdir} -lprocfs
+Libs: -L${libdir} -lprocps
 Libs.private:
 Cflags: -I${includedir}

proc/libprocps.sym

@@ -1,4 +1,4 @@
-LIBPROCFS_0 {
+LIBPROCPS_0 {
 global:
 	Hertz;
 	__cyg_profile_func_enter;

ps/Makefile.am

@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -include $(top_builddir)/config.h
 
 AM_CFLAGS = -I../proc -I../include
-AM_LDFLAGS = ../proc/libprocfs.la
+AM_LDFLAGS = ../proc/libprocps.la
 
 dist_man_MANS = ps.1
 

top/Makefile.am

@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -include $(top_builddir)/config.h
 
 AM_CFLAGS = -I../proc -I../include
-AM_LDFLAGS = ../proc/libprocfs.la
+AM_LDFLAGS = ../proc/libprocps.la
 
 if WITH_NCURSES
 usrbin_exec_PROGRAMS = \