comparison libpurple/protocols/oscar/util.c @ 18279:48d2c9dbfcc2

Allow AIM screen names of the form "[e-mail]" In most places we determine if a buddy is an ICQ user by checking if the first character of the screen name is a digit. But this check doesn't work now that email addresses are allowed for AIM screen names. This fixes #1430.

18278:c3d5b91be081

/*
 * Tokenizing functions.  Used to portably replace strtok/sep.
 *   -- DMP.
 *
 */
int
aimutil_tokslen(char *toSearch, int theindex, char dl)
{
	int curCount = 1;
	char *next;

/**
 * Check if the given screen name is a valid AIM screen name.
 * Example: BobDole
 * Example: [e-mail]
 *
 * @return TRUE if the screen name is valid, FALSE if not.
 */
static gboolean
aim_snvalid_aim(const char *sn)
{
	int i;

	for (i = 0; sn[i] != '\0'; i++) {
		if (!isalnum(sn[i]) && (sn[i] != ' ') &&
			(sn[i] != '@') && (sn[i] != '.') &&
			(sn[i] != '_') && (sn[i] != '-'))
			return FALSE;
	}

	return TRUE;

{
	int i;

	for (i = 0; sn[i] != '\0'; i++) {
		if (!isdigit(sn[i]))
			return 0;
	}

	return 1;
}

/**
 * Check if the given screen name is a valid SMS screen name.
 * Example: [phone]

aim_snvalid_sms(const char *sn)
{
	int i;

	if (sn[0] != '+')
		return 0;

	for (i = 1; sn[i] != '\0'; i++) {
		if (!isdigit(sn[i]))
			return 0;
	}

	return 1;
}

/**
 * Check if the given screen name is a valid oscar screen name.
 *

 */
gboolean
aim_snvalid(const char *sn)
{
	if ((sn == NULL) || (*sn == '\0'))
		return 0;

	if (isalpha(sn[0]))
		return aim_snvalid_aim(sn);
	else if (isdigit(sn[0]))
		return aim_snvalid_icq(sn);
	else if (sn[0] == '+')
		return aim_snvalid_sms(sn);

	return 0;
}

/**
 * Determine if a given screen name is an ICQ screen name
 * (i.e. it begins with a number).
 *
 * @sn A valid AIM or ICQ screen name.
 * @return TRUE if the screen name is an ICQ screen name.  Otherwise
 *         FALSE is returned.
 */
gboolean
aim_sn_is_icq(const char *sn)
{
	if (isalpha(sn[0]))
		return FALSE;
	return TRUE;
}

/**
 * Determine if a given screen name is an SMS number
 * (i.e. it begins with a +).
 *
 * @sn A valid AIM or ICQ screen name.
 * @return TRUE if the screen name is an SMS number.  Otherwise
 *         FALSE is returned.
 */
gboolean
aim_sn_is_sms(const char *sn)
{
	if (sn[0] != '+')
		return FALSE;
	return TRUE;
}

/**
 * This takes a screen name and returns its length without
 * spaces.  If there are no spaces in the SN, then the
 * return is equal to that of strlen().
 */
int
aim_snlen(const char *sn)
{
	int i = 0;

	if (!sn)
		return 0;

	while (*sn != '\0') {
		if (*sn != ' ')
			i++;
		sn++;
	}

	return i;
}

/**
 * This takes two screen names and compares them using the rules
 * on screen names for AIM/AOL.  Mainly, this means case and space
 * insensitivity (all case differences and spacing differences are
 * ignored, with the exception that screen names can not start with
 * a space).
 *
 * Return: 0 if equal
 *     non-0 if different
 */
int
aim_sncmp(const char *sn1, const char *sn2)
{

	if ((sn1 == NULL) || (sn2 == NULL))

18279:48d2c9dbfcc2

/*
 * Tokenizing functions.  Used to portably replace strtok/sep.
 *   -- DMP.
 *
 */
/* TODO: Get rid of this and use glib functions */
int
aimutil_tokslen(char *toSearch, int theindex, char dl)
{
	int curCount = 1;
	char *next;

/**
 * Check if the given screen name is a valid AIM screen name.
 * Example: BobDole
 * Example: [e-mail]
 * Example: [e-mail]
 *
 * @return TRUE if the screen name is valid, FALSE if not.
 */
static gboolean
aim_snvalid_aim(const char *sn)
{
	int i;

	if (purple_email_is_valid(sn))
		return TRUE;

	for (i = 0; sn[i] != '\0'; i++) {
		if (!isalnum(sn[i]) && (sn[i] != ' ') &&
			(sn[i] != '.') &&
			(sn[i] != '_') && (sn[i] != '-'))
			return FALSE;
	}

	return TRUE;

{
	int i;

	for (i = 0; sn[i] != '\0'; i++) {
		if (!isdigit(sn[i]))
			return FALSE;
	}

	return TRUE;
}

/**
 * Check if the given screen name is a valid SMS screen name.
 * Example: [phone]

aim_snvalid_sms(const char *sn)
{
	int i;

	if (sn[0] != '+')
		return FALSE;

	for (i = 1; sn[i] != '\0'; i++) {
		if (!isdigit(sn[i]))
			return FALSE;
	}

	return TRUE;
}

/**
 * Check if the given screen name is a valid oscar screen name.
 *

 */
gboolean
aim_snvalid(const char *sn)
{
	if ((sn == NULL) || (*sn == '\0'))
		return FALSE;

	return aim_snvalid_icq(sn) || aim_snvalid_sms(sn) || aim_snvalid_aim(sn);
}

/**
 * Determine if a given screen name is an ICQ screen name
 * (i.e. it is composed of only numbers).
 *
 * @param sn A valid AIM or ICQ screen name.
 * @return TRUE if the screen name is an ICQ screen name.  Otherwise
 *         FALSE is returned.
 */
gboolean
aim_sn_is_icq(const char *sn)
{
	return aim_snvalid_icq(sn);
}

/**
 * Determine if a given screen name is an SMS number
 * (i.e. it begins with a +).
 *
 * @param sn A valid AIM or ICQ screen name.
 * @return TRUE if the screen name is an SMS number.  Otherwise
 *         FALSE is returned.
 */
gboolean
aim_sn_is_sms(const char *sn)
{
	return (sn[0] == '+');
}

/**
 * This takes two screen names and compares them using the rules
 * on screen names for AIM/AOL.  Mainly, this means case and space
 * insensitivity (all case differences and spacing differences are
 * ignored, with the exception that screen names can not start with
 * a space).
 *
 * @return 0 if equal, non-0 if different
 */
/* TODO: Do something different for email addresses. */
int
aim_sncmp(const char *sn1, const char *sn2)
{

	if ((sn1 == NULL) || (sn2 == NULL))