Changeset 4143 for trunk/console

Timestamp:

07/08/05 07:32:16 (3 years ago)

Author:

emostar

Message:

Don't need to load protocol plugins anymore.

Fix tabbing with users. Allow using UINs once again.

Location:

trunk/console/src

Files:

• console.cpp (modified) (2 diffs)
• console.h (modified) (1 diff)
• console_menu.cpp (modified) (2 diffs)
• console_tab.cpp (modified) (12 diffs)

trunk/console/src/console.cpp

@@ -247 +247 @@
   m_nPipe = _licqDaemon->RegisterPlugin(SIGNAL_ALL);
   m_bExit = false; 
-  _licqDaemon->AddProtocolPlugins();
   licqDaemon = _licqDaemon;
   m_nCurrentGroup = gUserManager.DefaultGroup();
@@ -1310 +1309 @@
         nTabs = 2;
       }
+      free(szMatch);
       winPrompt->RefreshWin();
       break;

trunk/console/src/console.h

@@ -216 +216 @@
 {
   vector <char *> vszPartialMatch;
-  char szPartialMatch[32];
+  char *szPartialMatch;
 };
 

trunk/console/src/console_menu.cpp

@@ -747 +747 @@
       FOR_EACH_PROTO_USER_BREAK;
     }
+    else if (strcasecmp(szAlias, pUser->IdString()) == 0)
+    {
+      scon.szId = pUser->IdString();
+      scon.nPPID = pUser->PPID();
+      FOR_EACH_PROTO_USER_BREAK;
+    }
   }
   FOR_EACH_USER_END
@@ -994 +1000 @@
  * CLicqConsole::MenuRemove
  *-------------------------------------------------------------------------*/
-//TODO: add support for other protocols
 void CLicqConsole::MenuRemove(char *szArg)
 {
   char *sz = szArg;
-  unsigned long nUin = GetUinFromArg(&sz);
-
-  if (nUin == gUserManager.OwnerUin())
+  struct SContact scon = GetContactFromArg(&sz);
+
+  if (gUserManager.FindOwner(scon.szId, scon.nPPID))
     winMain->wprintf("%CYou can't remove yourself!\n", 16);
-  else if (nUin == 0)
+  else if (!scon.szId && scon.nPPID != (unsigned long)-1)
     winMain->wprintf("%CYou must specify a user to remove.\n", 16);
-  else if (nUin != (unsigned long)-1)
-  {
-    sprintf(szArg, "%lu", nUin);
-    UserCommand_Remove(szArg, LICQ_PPID, sz);
-  }
+  else
+    UserCommand_Remove(scon.szId, scon.nPPID, sz);
 }
 

trunk/console/src/console_tab.cpp

@@ -21 +21 @@
                               struct STabCompletion &_sTabCompletion)
 {
-  char szMatch[32] = "";
+  char *szMatch = 0;
   unsigned short nLen = strlen(_szPartialMatch);
   for (unsigned short i = 0; i < NUM_COMMANDS; i++)
@@ -29 +29 @@
     if (strncasecmp(_szPartialMatch, szTempCmd, nLen) == 0)
     {
-      if (szMatch[0] == '\0')
-        strcpy(szMatch, szTempCmd);
+      if (szMatch == 0)
+        szMatch = strdup(szTempCmd);
       else
         szMatch[StrMatchLen(szMatch, szTempCmd, nLen)] = '\0';
@@ -37 +37 @@
   }
   if (nLen == 0)
-    _sTabCompletion.szPartialMatch[0] = '\0';
+    _sTabCompletion.szPartialMatch = 0;
   else
-    strcpy(_sTabCompletion.szPartialMatch, szMatch);
+    _sTabCompletion.szPartialMatch = szMatch;
 }
 
@@ -49 +49 @@
                            struct STabCompletion &_sTabCompletion)
 {
-  char szMatch[32] = "";
+  char *szMatch = 0;
   unsigned short nLen;
 /*  char *szSubCmd = NULL;
@@ -76 +76 @@
       if (strncasecmp(_szPartialMatch, pUser->GetAlias(), nLen) == 0)
       {
-        if (szMatch[0] == '\0')
-          strcpy(szMatch, pUser->GetAlias());
+        if (szMatch == 0)
+          szMatch = strdup(pUser->GetAlias());
         else
           szMatch[StrMatchLen(szMatch, pUser->GetAlias(), nLen)] = '\0';
         _sTabCompletion.vszPartialMatch.push_back(strdup(pUser->GetAlias()));
+      }
+      else if (strncasecmp(_szPartialMatch, pUser->IdString(), nLen) == 0)
+      {
+        if (szMatch == 0)
+          szMatch = strdup(pUser->IdString());
+        else
+          szMatch[StrMatchLen(szMatch, pUser->IdString(), nLen)] = '\0';
+        _sTabCompletion.vszPartialMatch.push_back(strdup(pUser->IdString()));
       }
     }
@@ -86 +94 @@
 
     if (nLen == 0)
-      _sTabCompletion.szPartialMatch[0] = '\0';
+      _sTabCompletion.szPartialMatch = 0;
     else
-      strcpy(_sTabCompletion.szPartialMatch, szMatch);
+      _sTabCompletion.szPartialMatch = szMatch;
   }
 /*  else // Sub command time
@@ -122 +130 @@
                              struct STabCompletion &_sTabCompletion)
 {
-  char szMatch[32] = "";
+  char *szMatch = 0;
   unsigned short nLen = strlen(_szPartialMatch);
   for (unsigned short i = 0; i < NUM_STATUS; i++)
@@ -128 +136 @@
     if (strncasecmp(_szPartialMatch, aStatus[i].szName, nLen) == 0)
     {
-      if (szMatch[0] == '\0')
-        strcpy(szMatch, aStatus[i].szName);
+      if (szMatch == 0)
+        szMatch = strdup(aStatus[i].szName);
       else
         szMatch[StrMatchLen(szMatch, aStatus[i].szName, nLen)] = '\0';
@@ -136 +144 @@
   }
   if (nLen == 0)
-    _sTabCompletion.szPartialMatch[0] = '\0';
+    _sTabCompletion.szPartialMatch = 0;
   else
-    strcpy(_sTabCompletion.szPartialMatch, szMatch);
+    _sTabCompletion.szPartialMatch = szMatch;
 }
 
@@ -148 +156 @@
                           struct STabCompletion &_sTabCompletion)
 {
-  char szMatch[32] = "";
+  char *szMatch = 0;
   unsigned short nLen = strlen(_szPartialMatch);
   for (unsigned short i = 0; i < NUM_VARIABLES; i++)
@@ -154 +162 @@
     if (strncasecmp(_szPartialMatch, aVariables[i].szName, nLen) == 0)
     {
-      if (szMatch[0] == '\0')
-        strcpy(szMatch, aVariables[i].szName);
+      if (szMatch == 0)
+        szMatch = strdup(aVariables[i].szName);
       else
         szMatch[StrMatchLen(szMatch, aVariables[i].szName, nLen)] = '\0';
@@ -162 +170 @@
   }
   if (nLen == 0)
-    _sTabCompletion.szPartialMatch[0] = '\0';
+    _sTabCompletion.szPartialMatch = 0;
   else
-    strcpy(_sTabCompletion.szPartialMatch, szMatch);
+    _sTabCompletion.szPartialMatch = szMatch;
 }