mv strlcpy to libkysdk_strlcpy

(cherry picked from commit 8fb962eae5ade5aa420a696ea4f54c6219115c8f)
This commit is contained in:
peijiankang 2023-08-18 13:27:13 +08:00 committed by openeuler-sync-bot
parent 2273dfe19c
commit 771516b570
3 changed files with 51 additions and 3 deletions

View File

@ -1,12 +1,12 @@
Name: libkysdk-system
Version: 2.0.0
Release: 4
Version: 2.0.0.0
Release: 2
Summary: Kylin Software Development Kit - System Layer Kit
License: GPL-2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch01: 0001-fix-compile-error-of-libkysdk-system.patch
Patch02: mv-strlcpy-to-libkysdk_strlcpy.patch
BuildRequires: cmake
BuildRequires: glibc-devel
BuildRequires: systemd-devel
@ -244,6 +244,7 @@ Requires: libkysdk-realtime
%prep
%setup -q
%patch01 -p1
%patch02 -p1
%build
mkdir build && pushd build
@ -385,6 +386,12 @@ fi
%changelog
* Fri Aug 18 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-2
- add mv-strlcpy-to-libkysdk_strlcpy.patch
* Fri May 26 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0.0-1
- update version to 2.0.0.0
* Tue Mar 28 2023 peijiankang <peijiankang@kylinos.cn> - 2.0.0-4
- mv Requires libopencv-devel to opencv

View File

@ -0,0 +1,41 @@
From 98c2be623143c777e8a6a0222377d448e9bb1960 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 18 Aug 2023 13:26:11 +0800
Subject: [PATCH] mv strlcpy to libkysdk_strlcpy
---
src/proc/libkyprocess.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/proc/libkyprocess.c b/src/proc/libkyprocess.c
index 4d8553d..6c7482d 100644
--- a/src/proc/libkyprocess.c
+++ b/src/proc/libkyprocess.c
@@ -154,7 +154,7 @@ static int isnumber(char *c)
return 1;
}
-static size_t strlcpy(char *dst, const char *src, size_t siz)
+static size_t libkysdk_strlcpy(char *dst, const char *src, size_t siz)
{
char *d = dst;
const char *s = src;
@@ -811,7 +811,7 @@ static int get_proc_name(pid_t pid, char *name)
start = strchr(line, '(') + 1;
end = strrchr(start, ')');
num = end - start;
- strlcpy(name, start, num + 1);
+ libkysdk_strlcpy(name, start, num + 1);
fclose(fpprocstat);
return 0;
@@ -1387,4 +1387,4 @@ inline void kdk_proc_freeall(char **list)
index ++;
}
free(list);
-}
\ No newline at end of file
+}
--
2.33.0