diff options
Diffstat (limited to 'libps/spec.c')
| -rw-r--r-- | libps/spec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libps/spec.c b/libps/spec.c index d8188d6b6..5e540f870 100644 --- a/libps/spec.c +++ b/libps/spec.c @@ -21,7 +21,8 @@ #include <hurd.h> #include <stdio.h> #include <stdlib.h> -#include <assert.h> +#include <assert-backtrace.h> +#define assert assert_backtrace #include <pwd.h> #include <hurd/resource.h> #include <unistd.h> @@ -880,7 +881,7 @@ ps_cmp_times (struct proc_stat *ps1, struct proc_stat *ps2, tv1.tv_sec > tv2.tv_sec ? 1 : tv1.tv_sec < tv2.tv_sec ? -1 : tv1.tv_usec > tv2.tv_usec ? 1 - : tv2.tv_usec < tv2.tv_usec ? -1 + : tv1.tv_usec < tv2.tv_usec ? -1 : 0; } @@ -1022,7 +1023,7 @@ specs_add_alias (struct ps_fmt_specs *specs, exp->name = malloc (name_len + 1); if (! exp->name) return 0; - bcopy ((char *)alias->name, (char *)exp->name, name_len); + memcpy ((char *)exp->name, (char *)alias->name, name_len); ((char *)exp->name)[name_len] = '\0'; /* Copy the rest of the fields from ALIAS, but defaulting to SRC. */ |