Skip to content

Commit

Permalink
os-posix.c: move code around
Browse files Browse the repository at this point in the history
this moves code blocks so that functions and variables which
belongs to the same concept are now close to each other.
There's no actual code changes in there.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-ID: <20230901101302.3618955-6-mjt@tls.msk.ru>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Michael Tokarev authored and bonzini committed Sep 1, 2023
1 parent 8a768db commit 433aed5
Showing 1 changed file with 27 additions and 22 deletions.
49 changes: 27 additions & 22 deletions os-posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,6 @@
#include <sys/prctl.h>
#endif

/*
* Must set all three of these at once.
* Legal combinations are unset by name by uid
*/
static struct passwd *user_pwd; /* NULL non-NULL NULL */
static uid_t user_uid = (uid_t)-1; /* -1 -1 >=0 */
static gid_t user_gid = (gid_t)-1; /* -1 -1 >=0 */

static const char *chroot_dir;
static int daemonize;
static int daemon_pipe;

void os_setup_early_signal_handling(void)
{
Expand Down Expand Up @@ -97,6 +86,15 @@ void os_set_proc_name(const char *s)
#endif
}


/*
* Must set all three of these at once.
* Legal combinations are unset by name by uid
*/
static struct passwd *user_pwd; /* NULL non-NULL NULL */
static uid_t user_uid = (uid_t)-1; /* -1 -1 >=0 */
static gid_t user_gid = (gid_t)-1; /* -1 -1 >=0 */

/*
* Prepare to change user ID. optarg can be one of 3 forms:
* - a username, in which case user ID will be changed to its uid,
Expand Down Expand Up @@ -174,6 +172,9 @@ static void change_process_uid(void)
}
}


static const char *chroot_dir;

void os_set_chroot(const char *optarg)
{
chroot_dir = optarg;
Expand All @@ -194,6 +195,21 @@ static void change_root(void)

}


static int daemonize;
static int daemon_pipe;

bool is_daemonized(void)
{
return daemonize;
}

int os_set_daemonize(bool d)
{
daemonize = d;
return 0;
}

void os_daemonize(void)
{
if (daemonize) {
Expand Down Expand Up @@ -287,17 +303,6 @@ void os_set_line_buffering(void)
setvbuf(stdout, NULL, _IOLBF, 0);
}

bool is_daemonized(void)
{
return daemonize;
}

int os_set_daemonize(bool d)
{
daemonize = d;
return 0;
}

int os_mlock(void)
{
#ifdef HAVE_MLOCKALL
Expand Down

0 comments on commit 433aed5

Please sign in to comment.