mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

version: refactor get_uname_info()

Browse Source 
Some code from "builtin/bugreport.c" uses uname(2) to get system
information.

Let's refactor this code into a new get_uname_info() function, so
that we can reuse it in a following commit.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Usman Akinyemi
2025-02-15 21:20:49 +05:30
committed by Junio C Hamano
parent cdfd081df6
commit 0a78d61247
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/bugreport.c
View File

@ -12,10 +12,10 @@
#include "diagnose.h"
#include "object-file.h"
#include "setup.h"
#include "version.h"
static void get_system_info(struct strbuf *sys_info)
{
struct utsname uname_info;
char *shell = NULL;
/* get git version from native cmd */
@ -24,16 +24,7 @@ static void get_system_info(struct strbuf *sys_info)
/* system call for other version info */
strbuf_addstr(sys_info, "uname: ");
if (uname(&uname_info))
strbuf_addf(sys_info, _("uname() failed with error '%s' (%d)\n"),
strerror(errno),
errno);
else
strbuf_addf(sys_info, "%s %s %s %s\n",
uname_info.sysname,
uname_info.release,
uname_info.version,
uname_info.machine);
get_uname_info(sys_info);
strbuf_addstr(sys_info, _("compiler info: "));
get_compiler_info(sys_info);

20
version.c
View File

@ -3,6 +3,7 @@
#include "version-def.h"
#include "strbuf.h"
#include "sane-ctype.h"
#include "gettext.h"
const char git_version_string[] = GIT_VERSION;
const char git_built_from_commit_string[] = GIT_BUILT_FROM_COMMIT;
@ -47,3 +48,22 @@ const char *git_user_agent_sanitized(void)
return agent;
}
int get_uname_info(struct strbuf *buf)
{
struct utsname uname_info;
if (uname(&uname_info)) {
strbuf_addf(buf, _("uname() failed with error '%s' (%d)\n"),
strerror(errno),
errno);
return -1;
}
strbuf_addf(buf, "%s %s %s %s\n",
uname_info.sysname,
uname_info.release,
uname_info.version,
uname_info.machine);
return 0;
}

7
version.h
View File

@ -7,4 +7,11 @@ extern const char git_built_from_commit_string[];
const char *git_user_agent(void);
const char *git_user_agent_sanitized(void);
/*
Try to get information about the system using uname(2).
Return -1 and put an error message into 'buf' in case of uname()
error. Return 0 and put uname info into 'buf' otherwise.
*/
int get_uname_info(struct strbuf *buf);
#endif /* VERSION_H */