24697298032

Committed 20 Apr 2026 09:22PM UTC coverage: 72.23% (+1.6%) from 70.661%

Build # 24697298032

Build Type

push

github

Committed by

bluca

Commit Message

sysupdate: Emit READY=1 status when installing

`READY=1` is already correctly emitted when acquiring an update, but was
forgotten to be emitted when subsequently installing that update.

That meant that the state tracking code in `sysupdated` and hence
`updatectl` could not properly report the progress of the install
operation, and hence printed “Already up-to-date” after a successful
update installation, rather than “Done”.

Add a test to catch this in future.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Fixes: https://github.com/systemd/systemd/issues/41502

Coverage Stats

322667 of 446720 relevant lines covered (72.23%)

1191594.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

92.86

/src/basic/parse-util.h

/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once

#include "basic-forward.h"

typedef unsigned long loadavg_t;

int parse_boolean(const char *v) _pure_;
int parse_tristate_full(const char *v, const char *third, int *ret);
static inline int parse_tristate(const char *v, int *ret) {
        return parse_tristate_full(v, NULL, ret);
}
int parse_pid(const char *s, pid_t *ret);
int parse_mode(const char *s, mode_t *ret);
int parse_ifindex(const char *s);
int parse_mtu(int family, const char *s, uint32_t *ret);

int parse_size(const char *t, uint64_t base, uint64_t *size);
int parse_sector_size(const char *t, uint64_t *ret);
int parse_range(const char *t, unsigned *lower, unsigned *upper);
int parse_errno(const char *t);
int parse_fd(const char *t);
int parse_user_shell(const char *s, char **ret_sh, bool *ret_copy);

int parse_capability_set(const char *s, uint64_t initial, uint64_t *current);

#define SAFE_ATO_REFUSE_PLUS_MINUS (1U << 30)
#define SAFE_ATO_REFUSE_LEADING_ZERO (1U << 29)
#define SAFE_ATO_REFUSE_LEADING_WHITESPACE (1U << 28)
#define SAFE_ATO_ALL_FLAGS (SAFE_ATO_REFUSE_PLUS_MINUS|SAFE_ATO_REFUSE_LEADING_ZERO|SAFE_ATO_REFUSE_LEADING_WHITESPACE)
#define SAFE_ATO_MASK_FLAGS(base) ((base) & ~SAFE_ATO_ALL_FLAGS)

int safe_atou_full(const char *s, unsigned base, unsigned *ret_u);
static inline int safe_atou(const char *s, unsigned *ret_u) {
        return safe_atou_full(s, 0, ret_u);
}

int safe_atou_bounded(const char *s, unsigned min, unsigned max, unsigned *ret);

int safe_atoi(const char *s, int *ret_i);
int safe_atolli(const char *s, long long *ret_lli);

int safe_atou8_full(const char *s, unsigned base, uint8_t *ret);

static inline int safe_atou8(const char *s, uint8_t *ret) {
        return safe_atou8_full(s, 0, ret);
}

int safe_atou16_full(const char *s, unsigned base, uint16_t *ret);

static inline int safe_atou16(const char *s, uint16_t *ret) {
        return safe_atou16_full(s, 0, ret);
}

static inline int safe_atoux16(const char *s, uint16_t *ret) {
        return safe_atou16_full(s, 16, ret);
}

int safe_atoi16(const char *s, int16_t *ret);

static inline int safe_atou32_full(const char *s, unsigned base, uint32_t *ret_u) {
        assert_cc(sizeof(uint32_t) == sizeof(unsigned));
        return safe_atou_full(s, base, (unsigned*) ret_u);
}

static inline int safe_atou32(const char *s, uint32_t *ret_u) {
        return safe_atou32_full(s, 0, (unsigned*) ret_u);
}

static inline int safe_atoi32(const char *s, int32_t *ret_i) {
        assert_cc(sizeof(int32_t) == sizeof(int));
        return safe_atoi(s, (int*) ret_i);
}

int safe_atollu_full(const char *s, unsigned base, unsigned long long *ret_llu);

static inline int safe_atollu(const char *s, unsigned long long *ret_llu) {
        return safe_atollu_full(s, 0, ret_llu);
}

static inline int safe_atou64_full(const char *s, unsigned base, uint64_t *ret_u) {
        assert_cc(sizeof(uint64_t) == sizeof(unsigned long long));
        return safe_atollu_full(s, base, (unsigned long long*) ret_u);
}

static inline int safe_atou64(const char *s, uint64_t *ret_u) {
        return safe_atou64_full(s, 0, ret_u);
}

static inline int safe_atoi64(const char *s, int64_t *ret_i) {
        assert_cc(sizeof(int64_t) == sizeof(long long));
        return safe_atolli(s, (long long*) ret_i);
}

static inline int safe_atoux64(const char *s, uint64_t *ret) {
        assert_cc(sizeof(int64_t) == sizeof(unsigned long long));
        return safe_atollu_full(s, 16, (unsigned long long*) ret);
}

#if LONG_MAX == INT_MAX
static inline int safe_atolu_full(const char *s, unsigned base, unsigned long *ret_u) {
        assert_cc(sizeof(unsigned long) == sizeof(unsigned));
        return safe_atou_full(s, base, (unsigned*) ret_u);
}
static inline int safe_atoli(const char *s, long *ret_u) {
        assert_cc(sizeof(long) == sizeof(int));
        return safe_atoi(s, (int*) ret_u);
}
#else
static inline int safe_atolu_full(const char *s, unsigned base, unsigned long *ret_u) {
        assert_cc(sizeof(unsigned long) == sizeof(unsigned long long));
        return safe_atollu_full(s, base, (unsigned long long*) ret_u);
}
static inline int safe_atoli(const char *s, long *ret_u) {
        assert_cc(sizeof(long) == sizeof(long long));
        return safe_atolli(s, (long long*) ret_u);
}
#endif

static inline int safe_atolu(const char *s, unsigned long *ret_u) {
        return safe_atolu_full(s, 0, ret_u);
}

#if SIZE_MAX == UINT_MAX
static inline int safe_atozu(const char *s, size_t *ret_u) {
        assert_cc(sizeof(size_t) == sizeof(unsigned));
        return safe_atou(s, (unsigned *) ret_u);
}
#else
static inline int safe_atozu(const char *s, size_t *ret_u) {
        assert_cc(sizeof(size_t) == sizeof(unsigned long));
        return safe_atolu(s, ret_u);
}
#endif

int safe_atod(const char *s, double *ret_d);

int parse_fractional_part_u(const char **p, size_t digits, unsigned *res);

int parse_nice(const char *s, int *ret);

int parse_ip_port(const char *s, uint16_t *ret);
int parse_ip_port_range(const char *s, uint16_t *low, uint16_t *high, bool allow_zero);

int parse_oom_score_adjust(const char *s, int *ret);

/* Implement floating point using fixed integers, to improve performance when
 * calculating load averages. These macros can be used to extract the integer
 * and decimal parts of a value. */
#define LOADAVG_PRECISION_BITS  11
#define LOADAVG_FIXED_POINT_1_0 (1 << LOADAVG_PRECISION_BITS)
#define LOADAVG_INT_SIDE(x)     ((x) >> LOADAVG_PRECISION_BITS)
#define LOADAVG_DECIMAL_SIDE(x) LOADAVG_INT_SIDE(((x) & (LOADAVG_FIXED_POINT_1_0 - 1)) * 100)

/* Given a Linux load average (e.g. decimal number 34.89 where 34 is passed as i and 89 is passed as f), convert it
 * to a loadavg_t. */
int store_loadavg_fixed_point(unsigned long i, unsigned long f, loadavg_t *ret);
int parse_loadavg_fixed_point(const char *s, loadavg_t *ret);

bool nft_identifier_valid(const char *id);

1	/* SPDX-License-Identifier: LGPL-2.1-or-later */
2	#pragma once
3
4	#include "basic-forward.h"
5
6	typedef unsigned long loadavg_t;
7
8	int parse_boolean(const char *v) _pure_;
9	int parse_tristate_full(const char v, const char third, int *ret);
10	static inline int parse_tristate(const char v, int ret) {	5,849✔
11	return parse_tristate_full(v, NULL, ret);	5,849✔
12	}
13	int parse_pid(const char s, pid_t ret);
14	int parse_mode(const char s, mode_t ret);
15	int parse_ifindex(const char *s);
16	int parse_mtu(int family, const char s, uint32_t ret);
17
18	int parse_size(const char t, uint64_t base, uint64_t size);
19	int parse_sector_size(const char t, uint64_t ret);
20	int parse_range(const char t, unsigned lower, unsigned *upper);
21	int parse_errno(const char *t);
22	int parse_fd(const char *t);
23	int parse_user_shell(const char s, char ret_sh, bool ret_copy);
24
25	int parse_capability_set(const char s, uint64_t initial, uint64_t current);
26
27	#define SAFE_ATO_REFUSE_PLUS_MINUS (1U << 30)
28	#define SAFE_ATO_REFUSE_LEADING_ZERO (1U << 29)
29	#define SAFE_ATO_REFUSE_LEADING_WHITESPACE (1U << 28)
30	#define SAFE_ATO_ALL_FLAGS (SAFE_ATO_REFUSE_PLUS_MINUS\|SAFE_ATO_REFUSE_LEADING_ZERO\|SAFE_ATO_REFUSE_LEADING_WHITESPACE)
31	#define SAFE_ATO_MASK_FLAGS(base) ((base) & ~SAFE_ATO_ALL_FLAGS)
32
33	int safe_atou_full(const char s, unsigned base, unsigned ret_u);
34	static inline int safe_atou(const char s, unsigned ret_u) {	1,699,498✔
35	return safe_atou_full(s, 0, ret_u);	1,699,498✔
36	}
37
38	int safe_atou_bounded(const char s, unsigned min, unsigned max, unsigned ret);
39
40	int safe_atoi(const char s, int ret_i);
41	int safe_atolli(const char s, long long ret_lli);
42
43	int safe_atou8_full(const char s, unsigned base, uint8_t ret);
44
45	static inline int safe_atou8(const char s, uint8_t ret) {	144,484✔
46	return safe_atou8_full(s, 0, ret);	144,484✔
47	}
48
49	int safe_atou16_full(const char s, unsigned base, uint16_t ret);
50
51	static inline int safe_atou16(const char s, uint16_t ret) {	131✔
52	return safe_atou16_full(s, 0, ret);	131✔
53	}
54
55	static inline int safe_atoux16(const char s, uint16_t ret) {	3,900✔
56	return safe_atou16_full(s, 16, ret);	3,900✔
57	}
58
59	int safe_atoi16(const char s, int16_t ret);
60
61	static inline int safe_atou32_full(const char s, unsigned base, uint32_t ret_u) {	259,665✔
62	assert_cc(sizeof(uint32_t) == sizeof(unsigned));	259,665✔
63	return safe_atou_full(s, base, (unsigned*) ret_u);	259,644✔
64	}
65
66	static inline int safe_atou32(const char s, uint32_t ret_u) {	16,938✔
67	return safe_atou32_full(s, 0, (unsigned*) ret_u);	16,952✔
68	}
69
70	static inline int safe_atoi32(const char s, int32_t ret_i) {	25✔
71	assert_cc(sizeof(int32_t) == sizeof(int));	25✔
72	return safe_atoi(s, (int*) ret_i);	25✔
73	}
74
75	int safe_atollu_full(const char s, unsigned base, unsigned long long ret_llu);
76
77	static inline int safe_atollu(const char s, unsigned long long ret_llu) {	11,962✔
78	return safe_atollu_full(s, 0, ret_llu);	11,962✔
79	}
80
81	static inline int safe_atou64_full(const char s, unsigned base, uint64_t ret_u) {	1,676,230✔
82	assert_cc(sizeof(uint64_t) == sizeof(unsigned long long));	1,676,230✔
83	return safe_atollu_full(s, base, (unsigned long long*) ret_u);	1,676,230✔
84	}
85
86	static inline int safe_atou64(const char s, uint64_t ret_u) {	1,676,230✔
87	return safe_atou64_full(s, 0, ret_u);	1,645,753✔
88	}
89
90	static inline int safe_atoi64(const char s, int64_t ret_i) {	27✔
91	assert_cc(sizeof(int64_t) == sizeof(long long));	27✔
92	return safe_atolli(s, (long long*) ret_i);	27✔
93	}
94
95	static inline int safe_atoux64(const char s, uint64_t ret) {	59,312✔
96	assert_cc(sizeof(int64_t) == sizeof(unsigned long long));	59,312✔
97	return safe_atollu_full(s, 16, (unsigned long long*) ret);	59,312✔
98	}
99
100	#if LONG_MAX == INT_MAX
101	static inline int safe_atolu_full(const char s, unsigned base, unsigned long ret_u) {
102	assert_cc(sizeof(unsigned long) == sizeof(unsigned));
103	return safe_atou_full(s, base, (unsigned*) ret_u);
104	}
105	static inline int safe_atoli(const char s, long ret_u) {
106	assert_cc(sizeof(long) == sizeof(int));
107	return safe_atoi(s, (int*) ret_u);
108	}
109	#else
110	static inline int safe_atolu_full(const char s, unsigned base, unsigned long ret_u) {	96,517✔
111	assert_cc(sizeof(unsigned long) == sizeof(unsigned long long));	96,517✔
112	return safe_atollu_full(s, base, (unsigned long long*) ret_u);	22,847✔
113	}
114	static inline int safe_atoli(const char s, long ret_u) {	×
115	assert_cc(sizeof(long) == sizeof(long long));	×
116	return safe_atolli(s, (long long*) ret_u);	×
117	}
118	#endif
119
120	static inline int safe_atolu(const char s, unsigned long ret_u) {	87,545✔
121	return safe_atolu_full(s, 0, ret_u);	85,644✔
122	}
123
124	#if SIZE_MAX == UINT_MAX
125	static inline int safe_atozu(const char s, size_t ret_u) {
126	assert_cc(sizeof(size_t) == sizeof(unsigned));
127	return safe_atou(s, (unsigned *) ret_u);
128	}
129	#else
130	static inline int safe_atozu(const char s, size_t ret_u) {	1,901✔
131	assert_cc(sizeof(size_t) == sizeof(unsigned long));	1,901✔
132	return safe_atolu(s, ret_u);	1,901✔
133	}
134	#endif
135
136	int safe_atod(const char s, double ret_d);
137
138	int parse_fractional_part_u(const char *p, size_t digits, unsigned res);
139
140	int parse_nice(const char s, int ret);
141
142	int parse_ip_port(const char s, uint16_t ret);
143	int parse_ip_port_range(const char s, uint16_t low, uint16_t *high, bool allow_zero);
144
145	int parse_oom_score_adjust(const char s, int ret);
146
147	/* Implement floating point using fixed integers, to improve performance when
148	* calculating load averages. These macros can be used to extract the integer
149	* and decimal parts of a value. */
150	#define LOADAVG_PRECISION_BITS 11
151	#define LOADAVG_FIXED_POINT_1_0 (1 << LOADAVG_PRECISION_BITS)
152	#define LOADAVG_INT_SIDE(x) ((x) >> LOADAVG_PRECISION_BITS)
153	#define LOADAVG_DECIMAL_SIDE(x) LOADAVG_INT_SIDE(((x) & (LOADAVG_FIXED_POINT_1_0 - 1)) * 100)
154
155	/* Given a Linux load average (e.g. decimal number 34.89 where 34 is passed as i and 89 is passed as f), convert it
156	* to a loadavg_t. */
157	int store_loadavg_fixed_point(unsigned long i, unsigned long f, loadavg_t *ret);
158	int parse_loadavg_fixed_point(const char s, loadavg_t ret);
159
160	bool nft_identifier_valid(const char *id);

systemd / systemd / 24697298032

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous