rpl/src/instructions_o1.c - diff

Return to instructions_o1.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_o1.c between versions 1.27.2.2 and 1.44

version 1.27.2.2, 2011/04/14 08:46:44	version 1.44, 2012/01/17 14:44:08
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.0.23	RPL/2 (R) version 4.1.6
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 1972 instruction_open(struct_processus *s_eta	Line 1972 instruction_open(struct_processus *s_eta
protocole_socket = (unsigned char *)	protocole_socket = (unsigned char *)
((l_element_courant_sous_objet)	((l_element_courant_sous_objet)
.donnee).objet;	.donnee).objet;

	for(i = 0; i < strlen(protocole_socket); i++)
	{
	if ((protocole_socket[i] >= 'a') &&
	(protocole_socket[i] <= 'z'))
	{
	protocole_socket[i] -= 'a' - 'A';
	}
	}

}	}
else	else
{	{
Line 2812 instruction_open(struct_processus *s_eta	Line 2822 instruction_open(struct_processus *s_eta
return;	return;
}	}

	sqlite = NULL;

if (sqlite3_open_v2(nom, &sqlite,	if (sqlite3_open_v2(nom, &sqlite,
SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
NULL) != SQLITE_OK)	NULL) != SQLITE_OK)
{	{
	if (sqlite != NULL)
	{
	sqlite3_close(sqlite);
	}

free(nom);	free(nom);

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
Line 2918 instruction_open(struct_processus *s_eta	Line 2935 instruction_open(struct_processus *s_eta
}	}
else	else
{	{
	sqlite = NULL;

if (sqlite3_open_v2(nom, &sqlite,	if (sqlite3_open_v2(nom, &sqlite,
SQLITE_OPEN_READWRITE,	SQLITE_OPEN_READWRITE,
NULL) != SQLITE_OK)	NULL) != SQLITE_OK)
{	{
	if (sqlite != NULL)
	{
	sqlite3_close(sqlite);
	}

free(nom);	free(nom);

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
Line 3057 instruction_open(struct_processus *s_eta	Line 3081 instruction_open(struct_processus *s_eta
}	}
else	else
{	{
	sqlite = NULL;

if (sqlite3_open_v2(nom, &sqlite,	if (sqlite3_open_v2(nom, &sqlite,
SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
NULL) != SQLITE_OK)	NULL) != SQLITE_OK)
{	{
	if (sqlite != NULL)
	{
	sqlite3_close(sqlite);
	}

free(nom);	free(nom);

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
Line 3168 instruction_open(struct_processus *s_eta	Line 3199 instruction_open(struct_processus *s_eta
}	}
else	else
{	{
	sqlite = NULL;

if (sqlite3_open_v2(nom, &sqlite,	if (sqlite3_open_v2(nom, &sqlite,
SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
NULL) != SQLITE_OK)	NULL) != SQLITE_OK)
{	{
	if (sqlite != NULL)
	{
	sqlite3_close(sqlite);
	}

free(nom);	free(nom);

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
Line 3262 instruction_open(struct_processus *s_eta	Line 3300 instruction_open(struct_processus *s_eta
}	}
else	else
{	{
	sqlite = NULL;

if (sqlite3_open_v2(nom, &sqlite,	if (sqlite3_open_v2(nom, &sqlite,
SQLITE_OPEN_READWRITE,	SQLITE_OPEN_READWRITE,
NULL) != SQLITE_OK)	NULL) != SQLITE_OK)
{	{
	if (sqlite != NULL)
	{
	sqlite3_close(sqlite);
	}

free(nom);	free(nom);

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
Line 3340 instruction_open(struct_processus *s_eta	Line 3385 instruction_open(struct_processus *s_eta
return;	return;
}	}

	sqlite = NULL;

if (sqlite3_open_v2(nom, &sqlite,	if (sqlite3_open_v2(nom, &sqlite,
SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
NULL) != SQLITE_OK)	NULL) != SQLITE_OK)
{	{
	if (sqlite != NULL)
	{
	sqlite3_close(sqlite);
	}

free(nom);	free(nom);

liberation(s_etat_processus, s_objet_argument);	liberation(s_etat_processus, s_objet_argument);
Line 4006 instruction_open(struct_processus *s_eta	Line 4058 instruction_open(struct_processus *s_eta
return;	return;
}	}

	if ((type_adresse == ' ') && (type_domaine == 'L'))
	{
	if (strcmp(protocole, "IPV4") == 0)
	{
	for(i = 0; i < 4; adresse[i++] = 0);
	type_adresse = '4';
	}
	else if (strcmp(protocole, "IPV6") == 0)
	{
	for(i = 0; i < 16; adresse[i++] = 0);
	type_adresse = '6';
	}
	else
	{
	liberation(s_etat_processus, s_objet_argument);

	(*s_etat_processus).erreur_execution =
	d_ex_erreur_parametre_fichier;
	return;
	}
	}

if (((strcmp(protocole, "IPV4") == 0) && (type_adresse == '6')) \|\|	if (((strcmp(protocole, "IPV4") == 0) && (type_adresse == '6')) \|\|
((strcmp(protocole, "IPV6") == 0) && (type_adresse == '4')))	((strcmp(protocole, "IPV6") == 0) && (type_adresse == '4')))
{	{
Line 4037 instruction_open(struct_processus *s_eta	Line 4111 instruction_open(struct_processus *s_eta
}	}
else	else
{	{
for(i = 0; i < strlen(protocole_socket); i++)	if (strcmp(protocole_socket, "IPV4") == 0)
{
if ((protocole_socket[i] >= 'A') &&
(protocole_socket[i] <= 'Z'))
{
protocole_socket[i] += 'a' - 'A';
}
}

if (strcmp(protocole_socket, "ipv4") == 0)
{	{
protocole_socket[2] = d_code_fin_chaine;	protocole_socket[2] = d_code_fin_chaine;
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.27.2.2
changed lines
	Added in v.1.44