Skip to content

Commit 17fe017

Browse files
authored
bugfix: fix flock debug messages going to stderr (#6712)
Print them to stdout, for consistency with the rest of the debug messages. This amends commit 53bc658 ("modif: improve flock handling", 2024-04-17) / #6307.
1 parent dcd0489 commit 17fe017

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/firejail/preproc.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ static void preproc_lock_file(const char *path, int *lockfd_ptr) {
3333

3434
long pid = (long)getpid();
3535
if (arg_debug)
36-
fprintf(stderr, "pid=%ld: locking %s ...\n", pid, path);
36+
printf("pid=%ld: locking %s ...\n", pid, path);
3737

3838
if (*lockfd_ptr != -1) {
3939
if (arg_debug)
40-
fprintf(stderr, "pid=%ld: already locked %s\n", pid, path);
40+
printf("pid=%ld: already locked %s\n", pid, path);
4141
return;
4242
}
4343

@@ -59,7 +59,7 @@ static void preproc_lock_file(const char *path, int *lockfd_ptr) {
5959

6060
*lockfd_ptr = lockfd;
6161
if (arg_debug)
62-
fprintf(stderr, "pid=%ld: locked %s\n", pid, path);
62+
printf("pid=%ld: locked %s\n", pid, path);
6363
}
6464

6565
static void preproc_unlock_file(const char *path, int *lockfd_ptr) {
@@ -68,12 +68,12 @@ static void preproc_unlock_file(const char *path, int *lockfd_ptr) {
6868

6969
long pid = (long)getpid();
7070
if (arg_debug)
71-
fprintf(stderr, "pid=%ld: unlocking %s ...\n", pid, path);
71+
printf("pid=%ld: unlocking %s ...\n", pid, path);
7272

7373
int lockfd = *lockfd_ptr;
7474
if (lockfd == -1) {
7575
if (arg_debug)
76-
fprintf(stderr, "pid=%ld: already unlocked %s\n", pid, path);
76+
printf("pid=%ld: already unlocked %s\n", pid, path);
7777
return;
7878
}
7979

@@ -89,7 +89,7 @@ static void preproc_unlock_file(const char *path, int *lockfd_ptr) {
8989

9090
*lockfd_ptr = -1;
9191
if (arg_debug)
92-
fprintf(stderr, "pid=%ld: unlocked %s\n", pid, path);
92+
printf("pid=%ld: unlocked %s\n", pid, path);
9393
}
9494

9595
void preproc_lock_firejail_dir(void) {

0 commit comments

Comments
 (0)