From: Usman Akinyemi <usmanakinyemi202@gmail.com>
To: git@vger.kernel.org, =christian.couder@gmail.com
Cc: gitster@pobox.com, Johannes.Schindelin@gmx.de,
johncai86@gmail.com, me@ttaylorr.com, phillip.wood@dunelm.org.uk,
ps@pks.im, rsbecker@nexbridge.com, sunshine@sunshineco.com,
usmanakinyemi202@gmail.com,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v4 3/6] version: refactor get_uname_info()
Date: Thu, 6 Feb 2025 00:22:33 +0530 [thread overview]
Message-ID: <20250205185246.111447-4-usmanakinyemi202@gmail.com> (raw)
In-Reply-To: <20250205185246.111447-1-usmanakinyemi202@gmail.com>
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>
---
builtin/bugreport.c | 13 ++-----------
version.c | 20 ++++++++++++++++++++
version.h | 7 +++++++
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
index 7c2df035c9..5e13d532a8 100644
--- a/builtin/bugreport.c
+++ b/builtin/bugreport.c
@@ -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);
diff --git a/version.c b/version.c
index 60df71fd0e..3ec8b8243d 100644
--- a/version.c
+++ b/version.c
@@ -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;
+}
diff --git a/version.h b/version.h
index 7c62e80577..afe3dbbab7 100644
--- a/version.h
+++ b/version.h
@@ -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 */
--
2.48.1
next prev parent reply other threads:[~2025-02-05 18:53 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 10:30 [PATCH 0/4][Outreachy] Introduce os-version Capability with Configurable Options Usman Akinyemi
2025-01-06 10:30 ` [PATCH 1/4] version: refactor redact_non_printables() Usman Akinyemi
2025-01-06 22:35 ` Eric Sunshine
2025-01-08 12:58 ` Usman Akinyemi
2025-01-06 10:30 ` [PATCH 2/4] version: refactor get_uname_info() Usman Akinyemi
2025-01-06 16:04 ` Junio C Hamano
2025-01-08 13:06 ` Usman Akinyemi
2025-01-06 10:30 ` [PATCH 3/4] connect: advertise OS version Usman Akinyemi
2025-01-06 16:22 ` Junio C Hamano
2025-01-08 13:06 ` Usman Akinyemi
2025-01-08 16:15 ` Junio C Hamano
2025-01-09 14:25 ` Usman Akinyemi
2025-01-09 15:46 ` Junio C Hamano
2025-01-10 17:56 ` Usman Akinyemi
2025-01-10 19:24 ` Junio C Hamano
2025-01-11 11:07 ` Usman Akinyemi
2025-01-13 15:46 ` Junio C Hamano
2025-01-13 18:26 ` Usman Akinyemi
2025-01-13 19:47 ` Junio C Hamano
2025-01-13 20:07 ` rsbecker
2025-01-06 23:17 ` Eric Sunshine
2025-01-08 13:14 ` Usman Akinyemi
2025-01-06 10:30 ` [PATCH 4/4] version: introduce osversion.command config for os-version output Usman Akinyemi
2025-01-17 10:46 ` [PATCH v2 0/6][Outreachy] Introduce os-version Capability with Configurable Options Usman Akinyemi
2025-01-17 10:46 ` [PATCH v2 1/6] version: refactor redact_non_printables() Usman Akinyemi
2025-01-17 18:26 ` Junio C Hamano
2025-01-17 19:48 ` Junio C Hamano
2025-01-20 17:10 ` Usman Akinyemi
2025-01-21 8:12 ` Christian Couder
2025-01-21 18:01 ` Junio C Hamano
2025-01-17 10:46 ` [PATCH v2 2/6] version: refactor get_uname_info() Usman Akinyemi
2025-01-17 10:46 ` [PATCH v2 3/6] version: extend get_uname_info() to hide system details Usman Akinyemi
2025-01-17 18:27 ` Junio C Hamano
2025-01-17 10:46 ` [PATCH v2 4/6] t5701: add setup test to remove side-effect dependency Usman Akinyemi
2025-01-17 19:31 ` Junio C Hamano
2025-01-20 17:32 ` Usman Akinyemi
2025-01-20 19:52 ` Junio C Hamano
2025-01-21 13:43 ` Usman Akinyemi
2025-01-17 10:46 ` [PATCH v2 5/6] connect: advertise OS version Usman Akinyemi
2025-01-17 19:35 ` Junio C Hamano
2025-01-17 22:22 ` Junio C Hamano
2025-01-17 22:47 ` rsbecker
2025-01-17 23:04 ` Junio C Hamano
2025-01-20 18:15 ` Usman Akinyemi
2025-01-21 19:06 ` Junio C Hamano
2025-01-17 10:46 ` [PATCH v2 6/6] version: introduce osversion.command config for os-version output Usman Akinyemi
2025-01-17 21:44 ` Eric Sunshine
2025-01-20 18:17 ` Usman Akinyemi
2025-01-20 18:41 ` Eric Sunshine
2025-01-20 19:08 ` Usman Akinyemi
2025-01-17 22:33 ` Junio C Hamano
2025-01-17 22:49 ` rsbecker
2025-01-17 23:06 ` Junio C Hamano
2025-01-17 23:18 ` rsbecker
2025-01-20 18:58 ` Usman Akinyemi
2025-01-21 19:14 ` Junio C Hamano
2025-01-21 19:51 ` rsbecker
2025-01-24 12:21 ` [PATCH v3 0/6][Outreachy] Introduce os-version Capability with Configurable Options Usman Akinyemi
2025-01-24 12:21 ` [PATCH v3 1/6] version: replace manual ASCII checks with isprint() for clarity Usman Akinyemi
2025-01-24 18:13 ` Junio C Hamano
2025-01-24 12:21 ` [PATCH v3 2/6] version: refactor redact_non_printables() Usman Akinyemi
2025-01-24 12:21 ` [PATCH v3 3/6] version: refactor get_uname_info() Usman Akinyemi
2025-01-24 12:21 ` [PATCH v3 4/6] version: extend get_uname_info() to hide system details Usman Akinyemi
2025-01-24 12:21 ` [PATCH v3 5/6] t5701: add setup test to remove side-effect dependency Usman Akinyemi
2025-01-24 18:12 ` Junio C Hamano
2025-01-24 12:21 ` [PATCH v3 6/6] connect: advertise OS version Usman Akinyemi
2025-02-05 18:52 ` [PATCH v4 0/6][Outreachy] extend agent capability to include OS name Usman Akinyemi
2025-02-05 18:52 ` [PATCH v4 1/6] version: replace manual ASCII checks with isprint() for clarity Usman Akinyemi
2025-02-05 18:52 ` [PATCH v4 2/6] version: refactor redact_non_printables() Usman Akinyemi
2025-02-05 18:52 ` Usman Akinyemi [this message]
2025-02-05 18:52 ` [PATCH v4 4/6] version: extend get_uname_info() to hide system details Usman Akinyemi
2025-02-05 18:52 ` [PATCH v4 5/6] t5701: add setup test to remove side-effect dependency Usman Akinyemi
2025-02-05 18:52 ` [PATCH v4 6/6] agent: advertise OS name via agent capability Usman Akinyemi
2025-02-05 21:48 ` Junio C Hamano
2025-02-06 6:37 ` Usman Akinyemi
2025-02-06 15:13 ` Junio C Hamano
2025-02-07 17:27 ` Usman Akinyemi
2025-02-07 17:57 ` Junio C Hamano
2025-02-07 19:25 ` Usman Akinyemi
2025-02-14 12:36 ` [PATCH v5 0/6][Outreachy] extend agent capability to include OS name Usman Akinyemi
2025-02-14 12:36 ` [PATCH v5 1/6] version: replace manual ASCII checks with isprint() for clarity Usman Akinyemi
2025-02-14 12:36 ` [PATCH v5 2/6] version: refactor redact_non_printables() Usman Akinyemi
2025-02-14 12:36 ` [PATCH v5 3/6] version: refactor get_uname_info() Usman Akinyemi
2025-02-14 12:36 ` [PATCH v5 4/6] version: extend get_uname_info() to hide system details Usman Akinyemi
2025-02-14 12:36 ` [PATCH v5 5/6] t5701: add setup test to remove side-effect dependency Usman Akinyemi
2025-02-14 21:49 ` Junio C Hamano
2025-02-14 12:36 ` [PATCH v5 6/6] agent: advertise OS name via agent capability Usman Akinyemi
2025-02-14 22:07 ` Junio C Hamano
2025-02-15 15:29 ` Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 0/6][Outreachy] extend agent capability to include OS name Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 1/6] version: replace manual ASCII checks with isprint() for clarity Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 2/6] version: refactor redact_non_printables() Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 3/6] version: refactor get_uname_info() Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 4/6] version: extend get_uname_info() to hide system details Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 5/6] t5701: add setup test to remove side-effect dependency Usman Akinyemi
2025-02-15 15:50 ` [PATCH v6 6/6] agent: advertise OS name via agent capability Usman Akinyemi
2025-02-18 17:14 ` Junio C Hamano
2025-02-18 17:09 ` [PATCH v6 0/6][Outreachy] extend agent capability to include OS name Junio C Hamano
2025-01-24 18:39 ` [PATCH v3 0/6][Outreachy] Introduce os-version Capability with Configurable Options Junio C Hamano
2025-01-27 13:38 ` Christian Couder
2025-01-27 15:26 ` Junio C Hamano
2025-01-31 14:30 ` Christian Couder
2025-01-31 16:37 ` Junio C Hamano
2025-01-31 19:42 ` Usman Akinyemi
2025-01-31 20:15 ` Junio C Hamano
2025-01-31 19:46 ` Usman Akinyemi
2025-01-31 20:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250205185246.111447-4-usmanakinyemi202@gmail.com \
--to=usmanakinyemi202@gmail.com \
--cc==christian.couder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ps@pks.im \
--cc=rsbecker@nexbridge.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).