mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-25 23:21:33 +03:00
Merge pull request #8769 from keszybz/followups
Three trivial followups for recent patches
This commit is contained in:
commit
80f0048203
@ -299,6 +299,18 @@
|
|||||||
</para>
|
</para>
|
||||||
</refsect1>
|
</refsect1>
|
||||||
|
|
||||||
|
<refsect1>
|
||||||
|
<title>Environment</title>
|
||||||
|
|
||||||
|
<variablelist class='environment-variables'>
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>$SYSTEMD_DEBUGGER</varname></term>
|
||||||
|
<listitem><para>Use the given debugger for the <command>debug</command>
|
||||||
|
command. See the <option>--debugger=</option> option.</para></listitem>
|
||||||
|
</varlistentry>
|
||||||
|
</variablelist>
|
||||||
|
</refsect1>
|
||||||
|
|
||||||
<refsect1>
|
<refsect1>
|
||||||
<title>Examples</title>
|
<title>Examples</title>
|
||||||
|
|
||||||
|
@ -1322,8 +1322,8 @@ int terminal_urlify_path(const char *path, const char *text, char **ret) {
|
|||||||
|
|
||||||
assert(path);
|
assert(path);
|
||||||
|
|
||||||
/* Much like terminal_urlify() above, but takes a file system path as input, and turns it into a properl
|
/* Much like terminal_urlify() above, but takes a file system path as input
|
||||||
* file:// URL first. */
|
* and turns it into a proper file:// URL first. */
|
||||||
|
|
||||||
if (isempty(path))
|
if (isempty(path))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -97,8 +97,8 @@ static int load_user_database(void) {
|
|||||||
return r;
|
return r;
|
||||||
|
|
||||||
while ((r = fgetpwent_sane(f, &pw)) > 0) {
|
while ((r = fgetpwent_sane(f, &pw)) > 0) {
|
||||||
int k, q;
|
|
||||||
char *n;
|
char *n;
|
||||||
|
int k, q;
|
||||||
|
|
||||||
n = strdup(pw->pw_name);
|
n = strdup(pw->pw_name);
|
||||||
if (!n)
|
if (!n)
|
||||||
@ -117,7 +117,7 @@ static int load_user_database(void) {
|
|||||||
return q;
|
return q;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (q <= 0 && k <= 0)
|
if (k <= 0 && q <= 0)
|
||||||
free(n);
|
free(n);
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
@ -164,7 +164,7 @@ static int load_group_database(void) {
|
|||||||
return q;
|
return q;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (q <= 0 && k <= 0)
|
if (k <= 0 && q <= 0)
|
||||||
free(n);
|
free(n);
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user