diff options
author | Ron Yorston <rmy@pobox.com> | 2025-08-15 09:00:13 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2025-08-15 09:00:13 +0100 |
commit | 01ff9c492111cf7d51ad074629d6e72bc69fc149 (patch) | |
tree | 394973e4e5f25dcd638185be75b84430c39ebab2 /win32 | |
parent | 9a2d9345377d38c428df6d3e0887956d359807ab (diff) | |
parent | 8bde71eb1502a5cdf186769b47d470038f99bc95 (diff) | |
download | busybox-w32-merge.tar.gz busybox-w32-merge.tar.bz2 busybox-w32-merge.zip |
Merge branch 'busybox' into mergemerge
Diffstat (limited to 'win32')
-rw-r--r-- | win32/process.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/process.c b/win32/process.c index 33f45ee42..0d120936e 100644 --- a/win32/process.c +++ b/win32/process.c | |||
@@ -795,7 +795,7 @@ UNUSED_PARAM | |||
795 | return sp; | 795 | return sp; |
796 | } | 796 | } |
797 | 797 | ||
798 | void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm) | 798 | int FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm) |
799 | { | 799 | { |
800 | const char *str, *cmdline; | 800 | const char *str, *cmdline; |
801 | 801 | ||
@@ -807,6 +807,7 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm) | |||
807 | else | 807 | else |
808 | cmdline = comm; | 808 | cmdline = comm; |
809 | safe_strncpy(buf, cmdline, col); | 809 | safe_strncpy(buf, cmdline, col); |
810 | return 0; | ||
810 | } | 811 | } |
811 | 812 | ||
812 | /** | 813 | /** |