From 07c2f0a9b1c7f79e81fa8a51cca5ecbe9eaf7293 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 2 Sep 2013 17:09:57 +0200 Subject: [PATCH] Rename from "luci-rpcd" to "rpcd" --- CMakeLists.txt | 8 ++++---- exec.c | 2 +- exec.h | 2 +- file.c | 2 +- file.h | 2 +- iwinfo.c | 2 +- iwinfo.h | 2 +- luci2.c | 2 +- luci2.h | 2 +- main.c | 2 +- plugin.c | 2 +- plugin.h | 6 +++--- session.c | 2 +- session.h | 2 +- uci.c | 2 +- uci.h | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f42902..f448a72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -PROJECT(luci-rpcd C) +PROJECT(rpcd C) ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations) OPTION(FILE_SUPPORT "File plugin support" ON) @@ -16,8 +16,8 @@ ENDIF() FIND_LIBRARY(json NAMES json-c json) -ADD_EXECUTABLE(luci-rpcd main.c exec.c session.c uci.c plugin.c) -TARGET_LINK_LIBRARIES(luci-rpcd ubox ubus uci dl blobmsg_json ${json}) +ADD_EXECUTABLE(rpcd main.c exec.c session.c uci.c plugin.c) +TARGET_LINK_LIBRARIES(rpcd ubox ubus uci dl blobmsg_json ${json}) SET(PLUGINS "") @@ -42,7 +42,7 @@ IF (IWINFO_SUPPORT) SET_TARGET_PROPERTIES(iwinfo_plugin PROPERTIES OUTPUT_NAME iwinfo PREFIX "") ENDIF() -INSTALL(TARGETS luci-rpcd ${PLUGINS} +INSTALL(TARGETS rpcd ${PLUGINS} RUNTIME DESTINATION sbin LIBRARY DESTINATION lib ) diff --git a/exec.c b/exec.c index 944ade4..c03e450 100644 --- a/exec.c +++ b/exec.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/exec.h b/exec.h index 8642c0b..05ba3ca 100644 --- a/exec.h +++ b/exec.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/file.c b/file.c index 2d33272..0e8df4f 100644 --- a/file.c +++ b/file.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/file.h b/file.h index 870e267..0cd2592 100644 --- a/file.h +++ b/file.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/iwinfo.c b/iwinfo.c index 893da01..b78a335 100644 --- a/iwinfo.c +++ b/iwinfo.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/iwinfo.h b/iwinfo.h index bc1a8bb..29ecf9f 100644 --- a/iwinfo.h +++ b/iwinfo.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/luci2.c b/luci2.c index bb68a4b..27eead5 100644 --- a/luci2.c +++ b/luci2.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/luci2.h b/luci2.h index 480c973..41c8321 100644 --- a/luci2.h +++ b/luci2.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/main.c b/main.c index 5f5c17f..efaa114 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Felix Fietkau * Copyright (C) 2013 Jo-Philipp Wich diff --git a/plugin.c b/plugin.c index 56260e2..33266b3 100644 --- a/plugin.c +++ b/plugin.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/plugin.h b/plugin.h index 6064b68..0d10f09 100644 --- a/plugin.h +++ b/plugin.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * @@ -38,10 +38,10 @@ #include "session.h" /* location of plugin executables */ -#define RPC_PLUGIN_DIRECTORY "/usr/libexec/luci-rpcd" +#define RPC_PLUGIN_DIRECTORY "/usr/libexec/rpcd" /* location of plugin libraries */ -#define RPC_LIBRARY_DIRECTORY "/usr/lib/luci-rpcd" +#define RPC_LIBRARY_DIRECTORY "/usr/lib/rpcd" struct rpc_daemon_ops { bool (*access)(const char *sid, const char *scope, diff --git a/session.c b/session.c index b43e763..d970d45 100644 --- a/session.c +++ b/session.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Felix Fietkau * Copyright (C) 2013 Jo-Philipp Wich diff --git a/session.h b/session.h index 3f50e77..bcdcb96 100644 --- a/session.h +++ b/session.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Felix Fietkau * Copyright (C) 2013 Jo-Philipp Wich diff --git a/uci.c b/uci.c index ac97cbd..aba897e 100644 --- a/uci.c +++ b/uci.c @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich * diff --git a/uci.h b/uci.h index cf0faa1..aa1e797 100644 --- a/uci.h +++ b/uci.h @@ -1,5 +1,5 @@ /* - * luci-rpcd - LuCI UBUS RPC server + * rpcd - UBUS RPC server * * Copyright (C) 2013 Jo-Philipp Wich *