#include "groupdav.h"
HashList *PreferenceHooks;
+extern HashList *HandlerHash;
typedef struct _PrefDef {
long Type;
StrBuf *Setting;
const char *PrefStr;
PrefEvalFunc OnLoad;
+ StrBuf *OnLoadName;
} PrefDef;
typedef struct _Preference {
{
PrefDef *Prefdef = (PrefDef*) vPrefDef;
FreeStrBuf(&Prefdef->Setting);
+ FreeStrBuf(&Prefdef->OnLoadName);
free(Prefdef);
}
free(Pref);
}
-void RegisterPreference(const char *Setting, long SettingLen,
- const char *PrefStr,
- long Type,
- PrefEvalFunc OnLoad)
+void _RegisterPreference(const char *Setting, long SettingLen,
+ const char *PrefStr,
+ long Type,
+ PrefEvalFunc OnLoad,
+ const char *OnLoadName)
{
PrefDef *Newpref = (PrefDef*) malloc(sizeof(PrefDef));
Newpref->Setting = NewStrBufPlain(Setting, SettingLen);
Newpref->PrefStr = PrefStr;
Newpref->Type = Type;
Newpref->OnLoad = OnLoad;
+ if (Newpref->OnLoad != NULL) {
+ Newpref->OnLoadName = NewStrBufPlain(OnLoadName, -1);
+ }
+ else
+ Newpref->OnLoadName = NULL;
Put(PreferenceHooks, Setting, SettingLen, Newpref, DestroyPrefDef);
}
const char *Key;
void *vSetting;
void *vPrefDef;
- Preference *Setting;
+ Preference *Pref;
PrefDef *PrefType;
It = GetNewHashPos(List, 0);
while (GetNextHashPos(List, It, &len, &Key, &vSetting))
{
- Setting = (Preference*) vSetting;
- if (GetHash(PreferenceHooks, SKEY(Setting->Key), &vPrefDef) &&
+ Pref = (Preference*) vSetting;
+ if (GetHash(PreferenceHooks, SKEY(Pref->Key), &vPrefDef) &&
(vPrefDef != NULL))
{
PrefType = (PrefDef*) vPrefDef;
- Setting->Type = PrefType;
- if (PrefType->OnLoad != NULL)
- PrefType->OnLoad(Setting->Val, Setting->lval);
+ Pref->Type = PrefType;
+
+ lprintf(1, "Loading [%s]with type [%ld] [\"%s\"]\n",
+ ChrPtr(Pref->Key),
+ Pref->Type->Type,
+ ChrPtr(Pref->Val));
+
+ switch (Pref->Type->Type)
+ {
+
+ case PRF_STRING:
+ break;
+ case PRF_INT:
+ Pref->lval = StrTol(Pref->Val);
+ Pref->decoded = 1;
+ break;
+ case PRF_QP_STRING:
+ Pref->DeQPed = NewStrBufPlain(NULL, StrLength(Pref->Val));
+ StrBufEUid_unescapize(Pref->DeQPed, Pref->Val);
+ Pref->decoded = 1;
+ break;
+ case PRF_YESNO:
+ Pref->lval = strcmp(ChrPtr(Pref->Val), "yes") == 0;
+ Pref->decoded = 1;
+ break;
+ }
+
+ if (PrefType->OnLoad != NULL){
+
+ lprintf(1, "Loading with: -> %s(\"%s\", %ld)\n",
+ ChrPtr(PrefType->OnLoadName),
+ ChrPtr(Pref->Val),
+ Pref->lval);
+ PrefType->OnLoad(Pref->Val, Pref->lval);
+ }
}
}
+ DeleteHashPos(&It);
}
void ParsePref(HashList **List, StrBuf *ReadBuf)
{
- StrBuf *Key;
+ int Done = 0;
Preference *Data = NULL;
Preference *LastData = NULL;
- Key = NewStrBuf();
- while (StrBuf_ServGetln(ReadBuf),
- strcmp(ChrPtr(ReadBuf), "000"))
- {
+ while (!Done) {
+ StrBuf_ServGetln(ReadBuf);
+ if ( (StrLength(ReadBuf)==3) &&
+ !strcmp(ChrPtr(ReadBuf), "000")) {
+ Done = 1;
+ break;
+ }
+
if ((ChrPtr(ReadBuf)[0] == ' ') &&
- (Data != NULL)) {
- StrBufAppendBuf(Data->Val, ReadBuf, 1);
+ (LastData != NULL)) {
+ StrBufAppendBuf(LastData->Val, ReadBuf, 1);
}
else {
LastData = Data = malloc(sizeof(Preference));
memset(Data, 0, sizeof(Preference));
+ Data->Key = NewStrBuf();
+ Data->Val = NewStrBuf();
StrBufExtract_token(Data->Key, ReadBuf, 0, '|');
StrBufExtract_token(Data->Val, ReadBuf, 1, '|');
if (!IsEmptyStr(ChrPtr(Data->Key)))
DestroyPreference(Data);
LastData = NULL;
}
+ Data = NULL;
}
}
GetPrefTypes(*List);
*/
void load_preferences(void)
{
+ folder Room;
+ wcsession *WCC = WC;
+ int Done = 0;
StrBuf *ReadBuf;
- char buf[SIZ];
long msgnum = 0L;
- if (!goto_config_room())
- return;
+ memset(&Room, 0, sizeof(folder));
+ ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
+ if (goto_config_room(ReadBuf, &Room) != 0) {
+ FreeStrBuf(&ReadBuf);
+ FlushFolder(&Room);
+
+ return; /* oh well. */
+ }
- ReadBuf = NewStrBuf();
serv_puts("MSGS ALL|0|1");
StrBuf_ServGetln(ReadBuf);
if (GetServerStatus(ReadBuf, NULL) == 8) {
serv_puts("subj|__ WebCit Preferences __");
serv_puts("000");
}
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- msgnum = atol(buf);
+ while (!Done &&
+ StrBuf_ServGetln(ReadBuf)) {
+ if ( (StrLength(ReadBuf)==3) &&
+ !strcmp(ChrPtr(ReadBuf), "000")) {
+ Done = 1;
+ break;
+ }
+ msgnum = StrTol(ReadBuf);
}
if (msgnum > 0L) {
strcmp(ChrPtr(ReadBuf), "000"))) {
}
if (!strcmp(ChrPtr(ReadBuf), "text")) {
- ParsePref(&WC->hash_prefs, ReadBuf);
+ ParsePref(&WCC->hash_prefs, ReadBuf);
}
}
}
/* Go back to the room we're supposed to be in */
- serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
- StrBuf_ServGetln(ReadBuf);
- GetServerStatus(ReadBuf, NULL);
+ if (StrLength(WCC->CurRoom.name) > 0) {
+ serv_printf("GOTO %s", ChrPtr(WCC->CurRoom.name));
+ StrBuf_ServGetln(ReadBuf);
+ GetServerStatus(ReadBuf, NULL);
+ }
FreeStrBuf(&ReadBuf);
+ FlushFolder(&Room);
}
-/**
- * \brief Goto the user's configuration room, creating it if necessary.
- * \return 0 on success or nonzero upon failure.
+/*
+ * Goto the user's configuration room, creating it if necessary.
+ * returns 0 on success or nonzero upon failure.
*/
-int goto_config_room(void) {
- char buf[SIZ];
-
+int goto_config_room(StrBuf *Buf, folder *Room)
+{
serv_printf("GOTO %s", USERCONFIGROOM);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') { /* try to create the config room if not there */
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) { /* try to create the config room if not there */
serv_printf("CRE8 1|%s|4|0", USERCONFIGROOM);
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(Buf);
+ GetServerStatus(Buf, NULL);
+
serv_printf("GOTO %s", USERCONFIGROOM);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '2') return(1);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ return(1);
+ }
}
+ ParseGoto(Room, Buf);
return(0);
}
void WritePrefsToServer(HashList *Hash)
{
+ wcsession *WCC = WC;
long len;
HashPos *HashPos;
void *vPref;
Preference *Pref;
StrBuf *SubBuf = NULL;
- Hash = WC->hash_prefs;
+ Hash = WCC->hash_prefs;
#ifdef DBG_PREFS_HASH
dbg_PrintHash(Hash, PrintPref, NULL);
#endif
int n = 0;
size_t offset, nchars;
if (SubBuf == NULL)
- SubBuf = NewStrBuf();
+ SubBuf = NewStrBufPlain(NULL, SIZ);
nchars = 1;
offset = 0;
while (nchars > 0) {
*/
void save_preferences(void)
{
- char buf[SIZ];
+ folder Room;
+ wcsession *WCC = WC;
+ int Done = 0;
+ StrBuf *ReadBuf;
long msgnum = 0L;
- if (goto_config_room() != 0) return; /* oh well. */
+ ReadBuf = NewStrBuf();
+ memset(&Room, 0, sizeof(folder));
+ if (goto_config_room(ReadBuf, &Room) != 0) {
+ FreeStrBuf(&ReadBuf);
+ FlushFolder(&Room);
+
+ return; /* oh well. */
+ }
+
+ /* make shure the config room has the right type, else it might reject our config */
+ if (Room.view != VIEW_BBS) {
+ serv_printf("VIEW %d", VIEW_BBS);
+ StrBuf_ServGetln(ReadBuf);
+ if (GetServerStatus(ReadBuf, NULL) != 2) {
+ /* UPS? */
+ }
+ else if (goto_config_room(ReadBuf, &Room) != 0) {
+ FreeStrBuf(&ReadBuf);
+ FlushFolder(&Room);
+
+ return; /* oh well. */
+ }
+ }
+
serv_puts("MSGS ALL|0|1");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '8') {
+ StrBuf_ServGetln(ReadBuf);
+ if (GetServerStatus(ReadBuf, NULL) == 8) {
serv_puts("subj|__ WebCit Preferences __");
serv_puts("000");
}
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- msgnum = atol(buf);
+ while (!Done &&
+ StrBuf_ServGetln(ReadBuf)) {
+ if ( (StrLength(ReadBuf)==3) &&
+ !strcmp(ChrPtr(ReadBuf), "000")) {
+ Done = 1;
+ break;
+ }
+ msgnum = StrTol(ReadBuf);
}
if (msgnum > 0L) {
serv_printf("DELE %ld", msgnum);
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(ReadBuf);
+ GetServerStatus(ReadBuf, NULL);
}
serv_printf("ENT0 1||0|1|__ WebCit Preferences __|");
- serv_getln(buf, sizeof buf);
- if (buf[0] == '4') {
+ StrBuf_ServGetln(ReadBuf);
+ if (GetServerStatus(ReadBuf, NULL) == 4) {
- WritePrefsToServer(WC->hash_prefs);
+ WritePrefsToServer(WCC->hash_prefs);
serv_puts("");
serv_puts("000");
}
/** Go back to the room we're supposed to be in */
- serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
- serv_getln(buf, sizeof buf);
+ if (StrLength(WCC->CurRoom.name) > 0) {
+ serv_printf("GOTO %s", ChrPtr(WCC->CurRoom.name));
+ StrBuf_ServGetln(ReadBuf);
+ GetServerStatus(ReadBuf, NULL);
+ }
+ FreeStrBuf(&ReadBuf);
+ FlushFolder(&Room);
}
/**
int save_to_server,
PrefDef *PrefType)
{
+ wcsession *WCC = WC;
void *vPrefDef;
Preference *Pref;
break;
}
}
- Put(WC->hash_prefs, key, keylen, Pref, DestroyPreference);
+ Put(WCC->hash_prefs, key, keylen, Pref, DestroyPreference);
- if (save_to_server) WC->SavePrefsToServer = 1;
+ if (save_to_server) WCC->SavePrefsToServer = 1;
}
void set_PREFERENCE(const char *key, size_t keylen, StrBuf *value, int save_to_server)
set_preference_backend(key, keylen, value, NULL, PRF_YESNO, save_to_server, NULL);
}
-int get_room_prefs_backend(const char *key, size_t keylen, Preference **Pref)
+int get_room_prefs_backend(const char *key, size_t keylen,
+ Preference **Pref)
{
StrBuf *pref_name;
int Ret;
- pref_name = NewStrBuf ();
- StrBufPrintf(pref_name, "%s:%s", key, ChrPtr(WC->wc_roomname));
+ pref_name = NewStrBufPlain (HKEY("ROOM:"));
+ StrBufAppendBuf(pref_name, WC->CurRoom.name, 0);
+ StrBufAppendBufPlain(pref_name, HKEY(":"), 0);
+ StrBufAppendBufPlain(pref_name, key, keylen, 0);
Ret = get_pref_backend(SKEY(pref_name), Pref);
FreeStrBuf(&pref_name);
return Ret;
}
+const StrBuf *get_X_PREFS(const char *key, size_t keylen,
+ const char *xkey, size_t xkeylen)
+{
+ int ret;
+ StrBuf *pref_name;
+ Preference *Prf;
+
+ pref_name = NewStrBufPlain (HKEY("XPREF:"));
+ StrBufAppendBufPlain(pref_name, xkey, xkeylen, 0);
+ StrBufAppendBufPlain(pref_name, HKEY(":"), 0);
+ StrBufAppendBufPlain(pref_name, key, keylen, 0);
+
+ ret = get_pref_backend(SKEY(pref_name), &Prf);
+ FreeStrBuf(&pref_name);
+
+ if (ret)
+ return Prf->Val;
+ else return NULL;
+}
+
+void set_X_PREFS(const char *key, size_t keylen, const char *xkey, size_t xkeylen, StrBuf *value, int save_to_server)
+{
+ StrBuf *pref_name;
+
+ pref_name = NewStrBufPlain (HKEY("XPREF:"));
+ StrBufAppendBufPlain(pref_name, xkey, xkeylen, 0);
+ StrBufAppendBufPlain(pref_name, HKEY(":"), 0);
+ StrBufAppendBufPlain(pref_name, key, keylen, 0);
+
+ set_preference_backend(SKEY(pref_name), 0, value, PRF_STRING, save_to_server, NULL);
+ FreeStrBuf(&pref_name);
+}
+
+
+long get_ROOM_PREFS_LONG(const char *key, size_t keylen, long *value, long Default)
+{
+ Preference *Pref;
+ int Ret;
+
+ Ret = get_room_prefs_backend(key, keylen, &Pref);
+
+ if (Ret == 0) {
+ *value = Default;
+ return 0;
+ }
+
+ if (Pref->decoded)
+ *value = Pref->lval;
+ else {
+ *value = Pref->lval = atol(ChrPtr(Pref->Val));
+ Pref->decoded = 1;
+ }
+ return Ret;
+}
+
+
StrBuf *get_ROOM_PREFS(const char *key, size_t keylen)
{
Preference *Pref;
{
StrBuf *pref_name;
- pref_name = NewStrBuf ();
- StrBufPrintf(pref_name, "%s:%s", key, ChrPtr(WC->wc_roomname));
+ pref_name = NewStrBufPlain (HKEY("ROOM:"));
+ StrBufAppendBuf(pref_name, WC->CurRoom.name, 0);
+ StrBufAppendBufPlain(pref_name, HKEY(":"), 0);
+ StrBufAppendBufPlain(pref_name, key, keylen, 0);
set_preference_backend(SKEY(pref_name), 0, value, PRF_STRING, save_to_server, NULL);
FreeStrBuf(&pref_name);
}
}
}
WCC->hash_prefs = Tmp;
+ DeleteHashPos(&It);
}
if (SettingStr != NULL)
StrBufAppendBufPlain(Target, SettingStr, -1, 0);
}
+void tmplput_CFG_RoomValueLong(StrBuf *Target, WCTemplputParams *TP)
+{
+ long lvalue;
+ long defval = 0;
+
+ if (HAVE_PARAM(1))
+ defval = GetTemplateTokenNumber(Target, TP, 1, 0);
+ get_ROOM_PREFS_LONG(TKEY(0), &lvalue, defval);
+ StrBufAppendPrintf(Target, "%ld", lvalue);
+}
void tmplput_CFG_RoomValue(StrBuf *Target, WCTemplputParams *TP)
{
StrBuf *pref = get_ROOM_PREFS(TKEY(0));
return 0;
}
-void CfgZoneTempl(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
- StrBuf *Zone = (StrBuf*) CTX;
-
- SVPutBuf("ZONENAME", Zone, 1);
-}
int ConditionalPreference(StrBuf *Target, WCTemplputParams *TP)
{
if (!get_PREFERENCE(TKEY(2), &Pref))
return 0;
- if (TP->Tokens->nParameters == 3) {
+ if (!HAVE_PARAM(3)) {
return 1;
}
- else if (TP->Tokens->Params[3]->Type == TYPE_STR)
- return ((TP->Tokens->Params[3]->len == StrLength(Pref)) &&
- (strcmp(TP->Tokens->Params[3]->Start, ChrPtr(Pref)) == 0));
+ else if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+ {
+ return StrTol(Pref) == GetTemplateTokenNumber (Target, TP, 3, 0);
+ }
else
- return (StrTol(Pref) == TP->Tokens->Params[3]->lvalue);
+ {
+ const char *pch;
+ long len;
+
+ GetTemplateTokenString(Target, TP, 3, &pch, &len);
+
+ return ((len == StrLength(Pref)) &&
+ (strcmp(pch, ChrPtr(Pref)) == 0));
+ }
}
int ConditionalHasPreference(StrBuf *Target, WCTemplputParams *TP)
*/
void offer_start_page(StrBuf *Target, WCTemplputParams *TP)
{
- wprintf("<a href=\"change_start_page?startpage=");
- urlescputs(WC->this_page);
- wprintf("\">");
- wprintf(_("Make this my start page"));
- wprintf("</a>");
-#ifdef TECH_PREVIEW
- wprintf("<br/><a href=\"rss?room=");
- urlescputs(ChrPtr(WC->wc_roomname));
- wprintf("\" title=\"RSS 2.0 feed for ");
- escputs(ChrPtr(WC->wc_roomname));
- wprintf("\"><img alt=\"RSS\" border=\"0\" src=\"static/xml_button.gif\"/></a>\n");
-#endif
+ wc_printf("<a href=\"change_start_page?startpage=");
+ urlescputs(ChrPtr(WC->Hdr->this_page));
+ wc_printf("\">");
+ wc_printf(_("Make this my start page"));
+ wc_printf("</a>");
}
*/
void change_start_page(void)
{
- if (!havebstr("startpage")) {
+ wcsession *WCC = WC;
+ const char *pch;
+ void *vHandler;
+ int ProhibitSave = 0;
+ const StrBuf *pStartPage = sbstr("startpage");
+
+ if (pStartPage != NULL) {
+ pch = strchr(ChrPtr(pStartPage), '?');
+
+ if ((pch != NULL) && (
+ GetHash(HandlerHash, ChrPtr(pStartPage), pch - ChrPtr(pStartPage), &vHandler),
+ (vHandler != NULL) &&
+ ((((WebcitHandler*)vHandler)->Flags & PROHIBIT_STARTPAGE) != 0)))
+ { /* OK, This handler doesn't want to be set as start page, prune it. */
+ ProhibitSave = 1;
+ }
+ }
+
+ if ((pStartPage == NULL) ||
+ (ProhibitSave == 1))
+ {
set_preference_backend(HKEY("startpage"),
0,
NewStrBufPlain(HKEY("")),
PRF_STRING,
1,
NULL);
- safestrncpy(WC->ImportantMessage,
- _("You no longer have a start page selected."),
- sizeof( WC->ImportantMessage));
+ if (ProhibitSave == 1)
+ StrBufAppendBufPlain(WCC->ImportantMsg,
+ _("This isn't allowed to become the start page."),
+ -1, 0);
+ else
+ StrBufAppendBufPlain(WCC->ImportantMsg,
+ _("You no longer have a start page selected."),
+ -1, 0);
display_main_menu();
return;
}
+
+
set_preference_backend(HKEY("startpage"),
0,
- NewStrBufDup(sbstr("startpage")),
+ NewStrBufDup(pStartPage),
PRF_STRING,
1,
NULL);
}
+void LoadStartpage(StrBuf *URL, long lvalue)
+{
+ const char *pch;
+ void *vHandler;
+ pch = strchr(ChrPtr(URL), '?');
+ if (pch == NULL) {
+ /* purge the sins of the past... */
+ pch = strchr(ChrPtr(URL), '&');
+ if (pch != NULL) {
+ StrBufPeek(URL, pch, -1, '?');
+ WC->SavePrefsToServer = 1;
+ }
+ }
+ else if (GetHash(HandlerHash, ChrPtr(URL), pch - ChrPtr(URL), &vHandler),
+ (vHandler != NULL) &&
+ ((((WebcitHandler*)vHandler)->Flags & PROHIBIT_STARTPAGE) != 0))
+ { /* OK, This handler doesn't want to be set as start page, prune it. */
+ FlushStrBuf(URL);
+ WC->SavePrefsToServer = 1;
+ }
+}
+
+
void
InitModule_PREFERENCES
(void)
{
- WebcitAddUrlHandler(HKEY("set_preferences"), set_preferences, 0);
- WebcitAddUrlHandler(HKEY("change_start_page"), change_start_page, 0);
+ WebcitAddUrlHandler(HKEY("set_preferences"), "", 0, set_preferences, 0);
+ WebcitAddUrlHandler(HKEY("change_start_page"), "", 0, change_start_page, 0);
+ RegisterPreference("startpage", _("Prefered startpage"), PRF_STRING, LoadStartpage);
- RegisterNamespace("OFFERSTARTPAGE", 0, 0, offer_start_page, CTX_NONE);
- RegisterNamespace("PREF:ROOM:VALUE", 1, 2, tmplput_CFG_RoomValue, CTX_NONE);
- RegisterNamespace("PREF:VALUE", 1, 2, tmplput_CFG_Value, CTX_NONE);
- RegisterNamespace("PREF:DESCR", 1, 1, tmplput_CFG_Descr, CTX_NONE);
- RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, CfgZoneTempl, NULL, CTX_PREF, CTX_NONE, IT_NOFLAG);
+ RegisterNamespace("OFFERSTARTPAGE", 0, 0, offer_start_page, NULL, CTX_NONE);
+ RegisterNamespace("PREF:ROOM:VALUE", 1, 2, tmplput_CFG_RoomValue, NULL, CTX_NONE);
+ RegisterNamespace("PREF:ROOM:VALUE:INT", 1, 2, tmplput_CFG_RoomValueLong, NULL, CTX_NONE);
+ RegisterNamespace("PREF:VALUE", 1, 2, tmplput_CFG_Value, NULL, CTX_NONE);
+
+ RegisterNamespace("PREF:DESCR", 1, 1, tmplput_CFG_Descr, NULL, CTX_NONE);
RegisterConditional(HKEY("COND:PREF"), 4, ConditionalPreference, CTX_NONE);
RegisterConditional(HKEY("COND:PREF:SET"), 4, ConditionalHasPreference, CTX_NONE);
GetGVSNHash, NULL, DeleteGVSNHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
}
+
+
+void
+ServerStartModule_PREFERENCES
+(void)
+{
+ PreferenceHooks = NewHash(1, NULL);
+}
+
+
+
+void
+ServerShutdownModule_PREFERENCES
+(void)
+{
+ DeleteHash(&PreferenceHooks);
+}
+
+void
+SessionDetachModule__PREFERENCES
+(wcsession *sess)
+{
+ if (sess->SavePrefsToServer) {
+ save_preferences();
+ sess->SavePrefsToServer = 0;
+ }
+}
+
+void
+SessionNewModule_PREFERENCES
+(wcsession *sess)
+{
+ sess->hash_prefs = NewHash(1,NULL);
+}
+
+void
+SessionDestroyModule_PREFERENCES
+(wcsession *sess)
+{
+ DeleteHash(&sess->hash_prefs);
+}
+
+
+
/*@}*/
projects / citadel.git / blobdiff