Rename user-facing bits of Dillo to Flenser.
I dunno if I got them all. This is also now version 0.0.0
This commit is contained in:
@ -33,7 +33,7 @@
|
||||
*/
|
||||
char *a_Dpi_sockdir_file(void)
|
||||
{
|
||||
char *dpi_socket_dir, *dirfile_path = "/.dillo/dpi_socket_dir";
|
||||
char *dpi_socket_dir, *dirfile_path = "/.flenser/dpi_socket_dir";
|
||||
|
||||
dpi_socket_dir = dStrconcat(dGethomedir(), dirfile_path, NULL);
|
||||
return dpi_socket_dir;
|
||||
@ -53,7 +53,7 @@ char *a_Dpi_rd_dpi_socket_dir(char *dirname)
|
||||
FILE *dir;
|
||||
char *sockdir = NULL, *rcpath;
|
||||
|
||||
rcpath = dStrconcat(dGethomedir(), "/.dillo", NULL);
|
||||
rcpath = dStrconcat(dGethomedir(), "/.flenser", NULL);
|
||||
|
||||
/* If .dillo does not exist it is an unrecoverable error */
|
||||
if (access(rcpath, F_OK) == -1) {
|
||||
|
||||
@ -78,7 +78,7 @@ char *mk_sockdir(void)
|
||||
{
|
||||
char *template, *logname;
|
||||
|
||||
logname = getenv("LOGNAME") ? getenv("LOGNAME") : "dillo";
|
||||
logname = getenv("LOGNAME") ? getenv("LOGNAME") : "flenser";
|
||||
template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
|
||||
if (a_Misc_mkdtemp(template) == NULL) {
|
||||
ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
|
||||
@ -90,7 +90,7 @@ char *mk_sockdir(void)
|
||||
}
|
||||
|
||||
/*! Create socket directory if it does not exist and save its name in
|
||||
* ~/.dillo/dpi_socket_dir.
|
||||
* ~/.flenser/dpi_socket_dir.
|
||||
* \Return
|
||||
* \li Socket directory name on success
|
||||
* \li NULL on failure.
|
||||
|
||||
@ -198,8 +198,8 @@ char *get_dpi_dir(char *dpidrc)
|
||||
|
||||
if (!rcline) {
|
||||
ERRMSG("dpi_dir", "Failed to find a dpi_dir entry in dpidrc", 0);
|
||||
MSG_ERR("Put your dillo plugins path in %s\n", dpidrc);
|
||||
MSG_ERR("e.g. dpi_dir=/usr/local/lib/dillo/dpi\n");
|
||||
MSG_ERR("Put your flenser plugins path in %s\n", dpidrc);
|
||||
MSG_ERR("e.g. dpi_dir=/usr/local/lib/flenser/dpi\n");
|
||||
MSG_ERR("with no leading spaces.\n");
|
||||
value = NULL;
|
||||
} else {
|
||||
@ -284,7 +284,7 @@ int get_dpi_attr(char *dpi_dir, char *service, struct dp *dpi_attr)
|
||||
|
||||
/*! Register a service
|
||||
* Retrieves attributes for "service" and stores them
|
||||
* in dpi_attr. It looks for "service" in ~/.dillo/dpi
|
||||
* in dpi_attr. It looks for "service" in ~/.flenser/dpi
|
||||
* first, and then in the system wide dpi directory.
|
||||
* Caller must allocate memory for dpi_attr.
|
||||
* \Return
|
||||
@ -383,7 +383,7 @@ int register_all(struct dp **attlist)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* Get list of services in user's .dillo/dpi directory */
|
||||
/* Get list of services in user's .flenser/dpi directory */
|
||||
snum = 0;
|
||||
if (user_dpidir) {
|
||||
DIR *user_dir_stream = opendir(user_dpidir);
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#define MSGLEN 50
|
||||
#define DPID_BASE_PORT (IPPORT_USERRESERVED + 20)
|
||||
|
||||
/*! \TODO: Should read this from dillorc */
|
||||
/*! \TODO: Should read this from flenserrc */
|
||||
#define SRS_NAME "dpid.srs"
|
||||
extern char *srs_name;
|
||||
|
||||
|
||||
@ -22,9 +22,9 @@
|
||||
#define MSG(...) printf("[dpid]: " __VA_ARGS__)
|
||||
#define MSG_ERR(...) fprintf(stderr, "[dpid]: " __VA_ARGS__)
|
||||
|
||||
#define dotDILLO_DPI ".dillo/dpi"
|
||||
#define dotDILLO_DPIDRC ".dillo/dpidrc"
|
||||
#define dotDILLO_DPID_COMM_KEYS ".dillo/dpid_comm_keys"
|
||||
#define dotDILLO_DPI ".flenser/dpi"
|
||||
#define dotDILLO_DPIDRC ".flenser/dpidrc"
|
||||
#define dotDILLO_DPID_COMM_KEYS ".flenser/dpid_comm_keys"
|
||||
|
||||
#define ERRMSG(CALLER, CALLED, ERR)\
|
||||
errmsg(CALLER, CALLED, ERR, __FILE__, __LINE__)
|
||||
|
||||
@ -32,7 +32,7 @@ static char SharedKey[32];
|
||||
|
||||
static void print_usage(const char *prgname)
|
||||
{
|
||||
fprintf(stderr,"Control program for the Dillo plugin daemon\n"
|
||||
fprintf(stderr,"Control program for the Flenser plugin daemon\n"
|
||||
"Usage: %s {stop|register|chat}\n\n", prgname);
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ static int Dpi_read_comm_keys(int *port)
|
||||
char *fname, *rcline = NULL, *tail;
|
||||
int i, ret = -1;
|
||||
|
||||
fname = dStrconcat(dGethomedir(), "/.dillo/dpid_comm_keys", NULL);
|
||||
fname = dStrconcat(dGethomedir(), "/.flenser/dpid_comm_keys", NULL);
|
||||
if ((In = fopen(fname, "r")) == NULL) {
|
||||
MSG_ERR("[Dpi_read_comm_keys] %s\n", dStrerror(errno));
|
||||
} else if ((rcline = dGetline(In)) == NULL) {
|
||||
|
||||
Reference in New Issue
Block a user