From 06cdd2484c5d0b7792168a7c2d99311e35b0fb8e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 8 Nov 2010 00:43:33 -0500 Subject: [PATCH] ac-power: make ac-power a proper binary that scripts can call --- .gitignore | 1 + Makefile.am | 14 +++++++++++++- src/ac-power.c | 17 +++++++++++++++-- src/ac-power.h | 27 --------------------------- 4 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 src/ac-power.h diff --git a/.gitignore b/.gitignore index a99cd174..21dd3945 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +systemd-ac-power systemd-timestamp systemd-cryptsetup systemd-cryptsetup-generator diff --git a/Makefile.am b/Makefile.am index 52bd13fe..69faa558 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,8 @@ rootlibexec_PROGRAMS = \ systemd-quotacheck \ systemd-cryptsetup \ systemd-cryptsetup-generator \ - systemd-timestamp + systemd-timestamp \ + systemd-ac-power noinst_PROGRAMS = \ test-engine \ @@ -724,6 +725,17 @@ systemd_timestamp_CFLAGS = \ systemd_timestamp_LDADD = \ libsystemd-basic.la +systemd_ac_power_SOURCES = \ + src/ac-power.c + +systemd_ac_power_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_ac_power_LDADD = \ + libsystemd-basic.la \ + $(UDEV_LIBS) + systemd_cryptsetup_SOURCES = \ src/cryptsetup.c diff --git a/src/ac-power.c b/src/ac-power.c index a30216ff..24a68e71 100644 --- a/src/ac-power.c +++ b/src/ac-power.c @@ -26,9 +26,8 @@ #include #include "util.h" -#include "ac-power.h" -int on_ac_power(void) { +static int on_ac_power(void) { int r; struct udev *udev; @@ -96,3 +95,17 @@ finish: return r; } + +int main(int argc, char *argv[]) { + int r; + + /* This is mostly intended to be used for scripts which want + * to detect whether AC power is plugged in or not. */ + + if ((r = on_ac_power()) < 0) { + log_error("Failed to read AC status: %s", strerror(-r)); + return EXIT_FAILURE; + } + + return r == 0; +} diff --git a/src/ac-power.h b/src/ac-power.h deleted file mode 100644 index 24f28b5e..00000000 --- a/src/ac-power.h +++ /dev/null @@ -1,27 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#ifndef fooacpowerhfoo -#define fooacpowerhfoo - -/*** - This file is part of systemd. - - Copyright 2010 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with systemd; If not, see . -***/ - -int on_ac_power(void); - -#endif -- 2.39.5