mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

common/file-helpers.c: share file_exists() to reduce duplication

Browse source
This commit is contained in:
Johan Malm 2023-08-21 21:07:28 +01:00 • committed by Johan Malm
parent a8951c4b75
commit a386133068
5 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/common/file-helpers.h Normal file
View file

@ -0,0 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef LABWC_FILE_HELPERS_H
#define LABWC_FILE_HELPERS_H
#include <stdbool.h>
/**
* file_exists() - Test if file exists.
* @filename: Name of file to test.
*/
bool file_exists(const char *filename);
#endif /* LABWC_FILE_HELPERS_H */

10
src/button/button-png.c
View file

@ -8,22 +8,14 @@
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <wlr/util/log.h>
#include "buffer.h"
#include "button/button-png.h"
#include "button/common.h"
#include "common/file-helpers.h"
#include "labwc.h"
#include "theme.h"
/* Share with session.c:isfile() */
static bool
file_exists(const char *path)
{
struct stat st;
return (!stat(path, &st));
}
/*
* cairo_image_surface_create_from_png() does not gracefully handle non-png
* files, so we verify the header before trying to read the rest of the file.

10
src/common/file-helpers.c Normal file
View file

@ -0,0 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <sys/stat.h>
#include "common/file-helpers.h"
bool
file_exists(const char *filename)
{
struct stat st;
return (!stat(filename, &st));
}

1
src/common/meson.build
View file

@ -2,6 +2,7 @@ labwc_sources += files(
'buf.c',
'dir.c',
'fd_util.c',
'file-helpers.c',
'font.c',
'grab-file.c',
'graphic-helpers.c',

10
src/config/session.c
View file

@ -8,18 +8,12 @@
#include <sys/stat.h>
#include <wlr/util/log.h>
#include "common/buf.h"
#include "common/file-helpers.h"
#include "common/mem.h"
#include "common/spawn.h"
#include "common/string-helpers.h"
#include "config/session.h"
static bool
isfile(const char *path)
{
struct stat st;
return (!stat(path, &st));
}
static bool
string_empty(const char *s)
{
@ -130,7 +124,7 @@ session_autostart_init(const char *dir)
if (!autostart) {
return;
}
if (!isfile(autostart)) {
if (!file_exists(autostart)) {
wlr_log(WLR_ERROR, "no autostart file");
goto out;
}