mirror of https://github.com/MidnightCommander/mc
Delete src/profile.[ch] files
Also: * add check for minimal version of glib (>= 2.6) * add subdir src/mcconfig into build action (by make)
This commit is contained in:
Slava Zanko
parent
3de5486aac
commit
c583b303da
|
|
@ -48,7 +48,7 @@ AC_ARG_WITH([glib_static],
|
|||
glib_found=no
|
||||
|
||||
if test "x$with_glib12" != "xyes"; then
|
||||
PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib_found=yes], [:])
|
||||
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6], [glib_found=yes], [:])
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes])
|
||||
|
|
@ -566,6 +566,7 @@ misc/Makefile
|
|||
misc/mc.ext
|
||||
|
||||
src/Makefile
|
||||
src/mcconfig/Makefile
|
||||
src/search/Makefile
|
||||
|
||||
edit/Makefile
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = search
|
||||
SUBDIRS = mcconfig search
|
||||
|
||||
AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
|
||||
|
||||
|
|
@ -40,7 +40,8 @@ endif
|
|||
endif
|
||||
|
||||
mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
|
||||
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV) search/libsearch.la
|
||||
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV) search/libsearch.la \
|
||||
mcconfig/libmcconfig.la
|
||||
|
||||
CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
|
||||
|
||||
|
|
@ -59,7 +60,7 @@ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
|
|||
menu.c menu.h mountlist.c mountlist.h mouse.c mouse.h myslang.h \
|
||||
option.c option.h panel.h panelize.c panelize.h poptalloca.h \
|
||||
popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c \
|
||||
profile.c profile.h rxvt.c screen.c setup.c setup.h \
|
||||
rxvt.c screen.c setup.c setup.h \
|
||||
slint.c subshell.c subshell.h textconf.c textconf.h \
|
||||
tree.c tree.h treestore.c treestore.h timefmt.h tty.c tty.h user.c \
|
||||
user.h util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c \
|
||||
|
|
|
|||
561
src/profile.c
561
src/profile.c
|
|
@ -1,561 +0,0 @@
|
|||
/*
|
||||
* Initialization-File Functions.
|
||||
*
|
||||
* From the Wine project
|
||||
|
||||
Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005,
|
||||
2007 Free Software Foundation, Inc.
|
||||
|
||||
This program 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.
|
||||
|
||||
This program 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 this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
/** \file profile.c
|
||||
* \brief Source: Initialization-files(ini) functions.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "global.h"
|
||||
#include "profile.h"
|
||||
#include "strutil.h"
|
||||
|
||||
#define STRSIZE 4096
|
||||
#define overflow (next == &CharBuffer [STRSIZE-1])
|
||||
|
||||
enum { FirstBrace, OnSecHeader, IgnoreToEOL, KeyDef, KeyDefOnKey, KeyValue };
|
||||
|
||||
typedef struct TKeys {
|
||||
char *KeyName;
|
||||
char *Value;
|
||||
struct TKeys *link;
|
||||
} TKeys;
|
||||
|
||||
typedef struct TSecHeader {
|
||||
char *AppName;
|
||||
TKeys *Keys;
|
||||
struct TSecHeader *link;
|
||||
} TSecHeader;
|
||||
|
||||
typedef struct TProfile {
|
||||
char *FileName;
|
||||
TSecHeader *Section;
|
||||
struct TProfile *link;
|
||||
} TProfile;
|
||||
|
||||
static TProfile *Base = 0;
|
||||
|
||||
static TProfile *
|
||||
find_loaded (const char *FileName, TSecHeader ** section)
|
||||
{
|
||||
TProfile *p = Base;
|
||||
|
||||
while (p) {
|
||||
if (!str_casecmp (FileName, p->FileName)) {
|
||||
*section = p->Section;
|
||||
return p;
|
||||
}
|
||||
p = p->link;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#define TRANSLATION_CHAR '\200'
|
||||
|
||||
static char *
|
||||
str_untranslate_newline_dup (char *s)
|
||||
{
|
||||
int l = 0;
|
||||
char *p = s, *q;
|
||||
g_return_val_if_fail(s, NULL);
|
||||
while (*p) {
|
||||
l++;
|
||||
l += (*p == '\n' || *p == TRANSLATION_CHAR);
|
||||
p++;
|
||||
}
|
||||
q = p = g_malloc (l + 1);
|
||||
if (!q)
|
||||
return 0;
|
||||
for (;;) {
|
||||
switch (*s) {
|
||||
case '\n':
|
||||
*p++ = TRANSLATION_CHAR;
|
||||
*p++ = 'n';
|
||||
break;
|
||||
case TRANSLATION_CHAR:
|
||||
if (s[1] == 'n' || s[1] == TRANSLATION_CHAR)
|
||||
*p++ = TRANSLATION_CHAR;
|
||||
*p++ = TRANSLATION_CHAR;
|
||||
break;
|
||||
case '\0':
|
||||
*p = '\0';
|
||||
return q;
|
||||
break;
|
||||
default:
|
||||
*p++ = *s;
|
||||
}
|
||||
s++;
|
||||
}
|
||||
return 0; /* not reached */
|
||||
}
|
||||
|
||||
static char *
|
||||
str_translate_newline_dup (char *s)
|
||||
{
|
||||
char *p, *q;
|
||||
g_return_val_if_fail(s,NULL);
|
||||
q = p = g_malloc (strlen (s) + 1);
|
||||
if (!q)
|
||||
return 0;
|
||||
while (*s) {
|
||||
if (*s == TRANSLATION_CHAR) {
|
||||
switch (*(++s)) {
|
||||
case 'n':
|
||||
*p++ = '\n';
|
||||
break;
|
||||
case TRANSLATION_CHAR:
|
||||
*p++ = TRANSLATION_CHAR;
|
||||
break;
|
||||
case '\0':
|
||||
*p++ = TRANSLATION_CHAR;
|
||||
*p++ = '\0';
|
||||
return q;
|
||||
default:
|
||||
*p++ = TRANSLATION_CHAR;
|
||||
*p++ = *s;
|
||||
}
|
||||
} else {
|
||||
*p++ = *s;
|
||||
}
|
||||
s++;
|
||||
}
|
||||
*p = '\0';
|
||||
return q; /* not reached */
|
||||
}
|
||||
|
||||
static TSecHeader *load (const char *file)
|
||||
{
|
||||
FILE *f;
|
||||
int state;
|
||||
TSecHeader *SecHeader = 0;
|
||||
char CharBuffer [STRSIZE];
|
||||
char *next = NULL; /* Not needed */
|
||||
int c;
|
||||
|
||||
if ((f = fopen (file, "r"))==NULL)
|
||||
return NULL;
|
||||
|
||||
state = FirstBrace;
|
||||
while ((c = getc (f)) != EOF){
|
||||
if (c == '\r') /* Ignore Carriage Return */
|
||||
continue;
|
||||
|
||||
switch (state){
|
||||
|
||||
case OnSecHeader:
|
||||
if (c == ']' || overflow){
|
||||
*next = '\0';
|
||||
next = CharBuffer;
|
||||
SecHeader->AppName = g_strdup (CharBuffer);
|
||||
state = IgnoreToEOL;
|
||||
} else
|
||||
*next++ = c;
|
||||
break;
|
||||
|
||||
case IgnoreToEOL:
|
||||
if (c == '\n'){
|
||||
state = KeyDef;
|
||||
next = CharBuffer;
|
||||
}
|
||||
break;
|
||||
|
||||
case FirstBrace:
|
||||
case KeyDef:
|
||||
case KeyDefOnKey:
|
||||
if (c == '['){
|
||||
TSecHeader *temp;
|
||||
|
||||
temp = SecHeader;
|
||||
SecHeader = g_new (TSecHeader, 1);
|
||||
SecHeader->link = temp;
|
||||
SecHeader->Keys = 0;
|
||||
state = OnSecHeader;
|
||||
next = CharBuffer;
|
||||
break;
|
||||
}
|
||||
if (state == FirstBrace) /* On first pass, don't allow dangling keys */
|
||||
break;
|
||||
|
||||
if ((c == ' ' && state != KeyDefOnKey) || c == '\t')
|
||||
break;
|
||||
|
||||
if (c == '\n' || overflow) {
|
||||
/* Abort Definition */
|
||||
next = CharBuffer;
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '=' || overflow){
|
||||
TKeys *temp;
|
||||
|
||||
temp = SecHeader->Keys;
|
||||
*next = '\0';
|
||||
SecHeader->Keys =g_new (TKeys, 1);
|
||||
SecHeader->Keys->link = temp;
|
||||
SecHeader->Keys->KeyName = g_strdup (CharBuffer);
|
||||
state = KeyValue;
|
||||
next = CharBuffer;
|
||||
} else {
|
||||
*next++ = c;
|
||||
state = KeyDefOnKey;
|
||||
}
|
||||
break;
|
||||
|
||||
case KeyValue:
|
||||
if (overflow || c == '\n'){
|
||||
*next = '\0';
|
||||
SecHeader->Keys->Value = str_translate_newline_dup (CharBuffer);
|
||||
state = c == '\n' ? KeyDef : IgnoreToEOL;
|
||||
next = CharBuffer;
|
||||
#ifdef DEBUG
|
||||
printf ("[%s] (%s)=%s\n", SecHeader->AppName,
|
||||
SecHeader->Keys->KeyName, SecHeader->Keys->Value);
|
||||
#endif
|
||||
} else
|
||||
*next++ = c;
|
||||
break;
|
||||
|
||||
} /* switch */
|
||||
|
||||
} /* while ((c = getc (f)) != EOF) */
|
||||
|
||||
switch (state) {
|
||||
case KeyValue:
|
||||
*next = '\0';
|
||||
SecHeader->Keys->Value = str_translate_newline_dup (CharBuffer);
|
||||
break;
|
||||
case OnSecHeader: { /* Broken initialization file */
|
||||
TSecHeader *link = SecHeader->link;
|
||||
g_free (SecHeader);
|
||||
SecHeader = link;
|
||||
fprintf (stderr, "Warning: Corrupted initialization file `%s'\n",
|
||||
file);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fclose (f);
|
||||
return SecHeader;
|
||||
}
|
||||
|
||||
static void new_key (TSecHeader *section, const char *KeyName, const char *Value)
|
||||
{
|
||||
TKeys *key;
|
||||
|
||||
key = g_new (TKeys, 1);
|
||||
key->KeyName = g_strdup (KeyName);
|
||||
key->Value = g_strdup (Value);
|
||||
key->link = section->Keys;
|
||||
section->Keys = key;
|
||||
}
|
||||
|
||||
static const char *
|
||||
GetSetProfileChar (int set, const char *AppName, const char *KeyName,
|
||||
const char *Default, const char *FileName)
|
||||
{
|
||||
|
||||
TProfile *Current;
|
||||
TSecHeader *section;
|
||||
TKeys *key;
|
||||
|
||||
Current = find_loaded (FileName, §ion);
|
||||
if (!Current) {
|
||||
Current = g_new (TProfile, 1);
|
||||
Current->link = Base;
|
||||
Current->FileName = g_strdup (FileName);
|
||||
Current->Section = load (FileName);
|
||||
Base = Current;
|
||||
section = Current->Section;
|
||||
}
|
||||
|
||||
/* Start search */
|
||||
for (; section; section = section->link){
|
||||
if (section->AppName == 0 || str_casecmp (section->AppName, AppName))
|
||||
continue;
|
||||
for (key = section->Keys; key; key = key->link){
|
||||
if (str_casecmp (key->KeyName, KeyName))
|
||||
continue;
|
||||
if (set){
|
||||
g_free (key->Value);
|
||||
key->Value = g_strdup (Default);
|
||||
}
|
||||
return key->Value;
|
||||
}
|
||||
/* If getting the information, then don't write the information
|
||||
to the INI file, need to run a couple of tests with windog */
|
||||
/* No key found */
|
||||
if (set){
|
||||
new_key (section, KeyName, Default);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Non existent section */
|
||||
if (set && Default){
|
||||
section = g_new (TSecHeader, 1);
|
||||
section->AppName = g_strdup (AppName);
|
||||
section->Keys = 0;
|
||||
new_key (section, KeyName, Default);
|
||||
section->link = Current->Section;
|
||||
Current->Section = section;
|
||||
}
|
||||
return Default;
|
||||
}
|
||||
|
||||
static short GetSetProfile (int set, const char * AppName, const char * KeyName,
|
||||
const char * Default, char * ReturnedString,
|
||||
short Size, const char * FileName)
|
||||
|
||||
{
|
||||
const char *s;
|
||||
|
||||
s = GetSetProfileChar (set, AppName, KeyName, Default, FileName);
|
||||
if (!set)
|
||||
g_strlcpy (ReturnedString, s, Size);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
short GetPrivateProfileString (const char * AppName, const char * KeyName,
|
||||
const char * Default, char * ReturnedString,
|
||||
short Size, const char * FileName)
|
||||
{
|
||||
return (GetSetProfile (0, AppName, KeyName, Default, ReturnedString, Size, FileName));
|
||||
}
|
||||
|
||||
const char *get_profile_string (const char *AppName, const char *KeyName, const char *Default,
|
||||
const char *FileName)
|
||||
{
|
||||
return GetSetProfileChar (0, AppName, KeyName, Default, FileName);
|
||||
}
|
||||
|
||||
int GetPrivateProfileInt (const char * AppName, const char * KeyName, int Default,
|
||||
const char * File)
|
||||
{
|
||||
char IntBuf [BUF_TINY];
|
||||
char buf [BUF_TINY];
|
||||
|
||||
g_snprintf (buf, sizeof (buf), "%d", Default);
|
||||
|
||||
/* Check the exact semantic with the SDK */
|
||||
GetPrivateProfileString (AppName, KeyName, buf, IntBuf, BUF_TINY, File);
|
||||
if (!str_casecmp (IntBuf, "true"))
|
||||
return 1;
|
||||
if (!str_casecmp (IntBuf, "yes"))
|
||||
return 1;
|
||||
return (int) atol (IntBuf);
|
||||
}
|
||||
|
||||
int WritePrivateProfileString (const char * AppName, const char * KeyName, const char * String,
|
||||
const char * FileName)
|
||||
{
|
||||
return GetSetProfile (1, AppName, KeyName, String, NULL, 0, FileName);
|
||||
}
|
||||
|
||||
static void dump_keys (FILE * profile, TKeys * p)
|
||||
{
|
||||
char *t;
|
||||
if (!p)
|
||||
return;
|
||||
dump_keys (profile, p->link);
|
||||
t = str_untranslate_newline_dup (p->Value);
|
||||
fprintf (profile, "%s=%s\n", p->KeyName, t);
|
||||
g_free (t);
|
||||
}
|
||||
|
||||
static void dump_sections (FILE *profile, TSecHeader *p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
dump_sections (profile, p->link);
|
||||
if (p->AppName [0]){
|
||||
fprintf (profile, "\n[%s]\n", p->AppName);
|
||||
dump_keys (profile, p->Keys);
|
||||
}
|
||||
}
|
||||
|
||||
static void dump_profile (TProfile *p)
|
||||
{
|
||||
FILE *profile;
|
||||
|
||||
if (!p)
|
||||
return;
|
||||
dump_profile (p->link);
|
||||
/* .ado: p->FileName can be empty, it's better to jump over */
|
||||
if (p->FileName[0] != (char) 0)
|
||||
if ((profile = fopen (p->FileName, "w")) != NULL){
|
||||
dump_sections (profile, p->Section);
|
||||
fclose (profile);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Must be called at the end of wine run
|
||||
*/
|
||||
|
||||
void sync_profiles (void)
|
||||
{
|
||||
dump_profile (Base);
|
||||
}
|
||||
|
||||
static void free_keys (TKeys *p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
free_keys (p->link);
|
||||
g_free (p->KeyName);
|
||||
g_free (p->Value);
|
||||
g_free (p);
|
||||
}
|
||||
|
||||
static void free_sections (TSecHeader *p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
free_sections (p->link);
|
||||
free_keys (p->Keys);
|
||||
g_free (p->AppName);
|
||||
p->link = 0;
|
||||
p->Keys = 0;
|
||||
g_free (p);
|
||||
}
|
||||
|
||||
static void free_profile (TProfile *p)
|
||||
{
|
||||
if (!p)
|
||||
return;
|
||||
free_profile (p->link);
|
||||
free_sections (p->Section);
|
||||
g_free (p->FileName);
|
||||
g_free (p);
|
||||
}
|
||||
|
||||
void free_profile_name (const char *s)
|
||||
{
|
||||
TProfile *p;
|
||||
|
||||
if (!s)
|
||||
return;
|
||||
|
||||
for (p = Base; p; p = p->link){
|
||||
if (strcmp (s, p->FileName) == 0){
|
||||
free_sections (p->Section);
|
||||
p->Section = 0;
|
||||
p->FileName [0] = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void free_profiles (void)
|
||||
{
|
||||
free_profile (Base);
|
||||
}
|
||||
|
||||
void *profile_init_iterator (const char *appname, const char *file)
|
||||
{
|
||||
TProfile *Current;
|
||||
TSecHeader *section;
|
||||
|
||||
Current = find_loaded (file, §ion);
|
||||
if (!Current) {
|
||||
Current = g_new (TProfile, 1);
|
||||
Current->link = Base;
|
||||
Current->FileName = g_strdup (file);
|
||||
Current->Section = load (file);
|
||||
Base = Current;
|
||||
section = Current->Section;
|
||||
}
|
||||
for (; section; section = section->link){
|
||||
if (str_casecmp (section->AppName, appname))
|
||||
continue;
|
||||
return section->Keys;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void *profile_iterator_next (void *s, char **key, char **value)
|
||||
{
|
||||
TKeys *keys = (TKeys *) s;
|
||||
|
||||
if (keys){
|
||||
*key = keys->KeyName;
|
||||
*value = keys->Value;
|
||||
keys = keys->link;
|
||||
}
|
||||
return keys;
|
||||
}
|
||||
|
||||
void profile_clean_section (const char *appname, const char *file)
|
||||
{
|
||||
TSecHeader *section;
|
||||
|
||||
/* We assume the user has called one of the other initialization funcs */
|
||||
if (!find_loaded (file, §ion)){
|
||||
fprintf (stderr,"Warning: profile_clean_section called before init\n");
|
||||
return;
|
||||
}
|
||||
/* We only disable the section, so it will still be freed, but it */
|
||||
/* won't be find by further walks of the structure */
|
||||
|
||||
for (; section; section = section->link){
|
||||
if (str_casecmp (section->AppName, appname))
|
||||
continue;
|
||||
section->AppName [0] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
int profile_has_section (const char *section_name, const char *profile)
|
||||
{
|
||||
TSecHeader *section;
|
||||
|
||||
/* We assume the user has called one of the other initialization funcs */
|
||||
if (!find_loaded (profile, §ion)){
|
||||
return 0;
|
||||
}
|
||||
for (; section; section = section->link){
|
||||
if (str_casecmp (section->AppName, section_name))
|
||||
continue;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void profile_forget_profile (const char *file)
|
||||
{
|
||||
TProfile *p;
|
||||
|
||||
for (p = Base; p; p = p->link){
|
||||
if (str_casecmp (file, p->FileName))
|
||||
continue;
|
||||
p->FileName [0] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
|
||||
/** \file profile.h
|
||||
* \brief Header: Initialization-files(ini) functions.
|
||||
*/
|
||||
|
||||
#ifndef MC_PROFILE_H
|
||||
#define MC_PROFILE_H
|
||||
|
||||
/* Prototypes for the profile management functions */
|
||||
|
||||
short GetPrivateProfileString (const char * AppName, const char * KeyName,
|
||||
const char * Default, char * ReturnedString,
|
||||
short Size, const char * FileName);
|
||||
|
||||
int GetProfileString (const char * AppName, const char * KeyName, const char * Default,
|
||||
char * ReturnedString, int Size);
|
||||
|
||||
int GetPrivateProfileInt (const char * AppName, const char * KeyName, int Default,
|
||||
const char * File);
|
||||
|
||||
int GetProfileInt (const char * AppName, const char * KeyName, int Default);
|
||||
|
||||
int WritePrivateProfileString (const char * AppName, const char * KeyName, const char * String,
|
||||
const char * FileName);
|
||||
|
||||
int WriteProfileString (const char * AppName, const char * KeyName, const char * String);
|
||||
|
||||
void sync_profiles (void);
|
||||
|
||||
void free_profiles (void);
|
||||
const char *get_profile_string (const char *AppName, const char *KeyName, const char *Default,
|
||||
const char *FileName);
|
||||
|
||||
/* New profile functions */
|
||||
|
||||
/* Returns a pointer for iterating on appname section, on profile file */
|
||||
void *profile_init_iterator (const char *appname, const char *file);
|
||||
|
||||
/* Returns both the key and the value of the current section. */
|
||||
/* You pass the current iterating pointer and it returns the new pointer */
|
||||
void *profile_iterator_next (void *s, char **key, char **value);
|
||||
|
||||
/* Removes all the definitions from section appname on file */
|
||||
void profile_clean_section (const char *appname, const char *file);
|
||||
int profile_has_section (const char *section_name, const char *profile);
|
||||
|
||||
/* Forgets about a .ini file, to disable updating of it */
|
||||
void profile_forget_profile (const char *file);
|
||||
|
||||
/* Removes information from a profile */
|
||||
void free_profile_name (const char *s);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue