Commit eba6b8d6 authored by Botond Baranyi's avatar Botond Baranyi
Browse files
parents 515dcdb2 59229a76
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// All rights reserved. This program and the accompanying materials // All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0 // are made available under the terms of the Eclipse Public License v1.0
// which accompanies this distribution, and is available at // which accompanies this distribution, and is available at
......
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// All rights reserved. This program and the accompanying materials // All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0 // are made available under the terms of the Eclipse Public License v1.0
// which accompanies this distribution, and is available at // which accompanies this distribution, and is available at
......
...@@ -1250,7 +1250,8 @@ static void add_file_to_makefile(struct makefile_struct *makefile, char *argumen ...@@ -1250,7 +1250,8 @@ static void add_file_to_makefile(struct makefile_struct *makefile, char *argumen
add_ttcn3_module(makefile, file_name, module_name); add_ttcn3_module(makefile, file_name, module_name);
} }
} else if (is_asn1_module(file_name, fp, &module_name)) { } else if (is_asn1_module(file_name, fp, &module_name)) {
if (is_valid_asn1_filename(file_name)) { expstring_t only_file_name = get_file_from_path(file_name);
if (is_valid_asn1_filename(only_file_name)) {
add_asn1_module(makefile, file_name, module_name); add_asn1_module(makefile, file_name, module_name);
} else { } else {
ERROR("The file name `%s' (without suffix) shall be identical to the module name `%s'.\n" ERROR("The file name `%s' (without suffix) shall be identical to the module name `%s'.\n"
...@@ -1258,6 +1259,7 @@ static void add_file_to_makefile(struct makefile_struct *makefile, char *argumen ...@@ -1258,6 +1259,7 @@ static void add_file_to_makefile(struct makefile_struct *makefile, char *argumen
"file name shall contain an underscore character instead.", file_name, module_name); "file name shall contain an underscore character instead.", file_name, module_name);
Free(module_name); Free(module_name);
} }
Free(only_file_name);
} else if (is_xsd_module(file_name, &module_name)) { } else if (is_xsd_module(file_name, &module_name)) {
add_xsd_module(makefile, file_name, module_name); add_xsd_module(makefile, file_name, module_name);
} else { } else {
......
#!/bin/sh #!/bin/sh
############################################################################### ###############################################################################
# Copyright (c) 2000-2015 Ericsson Telecom AB # Copyright (c) 2000-2016 Ericsson Telecom AB
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0 # are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at # which accompanies this distribution, and is available at
......
...@@ -198,7 +198,7 @@ Ericsson document 2/198 17-CRL 113 200 Uen: ...@@ -198,7 +198,7 @@ Ericsson document 2/198 17-CRL 113 200 Uen:
.SH AUTHOR .SH AUTHOR
This manpage is written by Janos Zoltan Szabo, Ericsson Telecom AB This manpage is written by Janos Zoltan Szabo, Ericsson Telecom AB
.br .br
Copyright (c) 2000-2015 Ericsson Telecom AB Copyright (c) 2000-2016 Ericsson Telecom AB
.br .br
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0 are made available under the terms of the Eclipse Public License v1.0
......
#!/usr/bin/perl -w #!/usr/bin/perl -w
############################################################################### ###############################################################################
# Copyright (c) 2000-2015 Ericsson Telecom AB # Copyright (c) 2000-2016 Ericsson Telecom AB
# All rights reserved. This program and the accompanying materials # All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0 # are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at # which accompanies this distribution, and is available at
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Complete the body of empty functions and // You may modify this file. Complete the body of empty functions and
// add your member functions here. // add your member functions here.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D // TTCN-3 Compiler of the TTCN-3 Test Executor version CRL 113 200/5 R4D
// for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016 // for eadrkir (eadrkir@eadrkir-VirtualBox) on Mon Apr 18 14:18:01 2016
// Copyright (c) 2000-2015 Ericsson Telecom AB // Copyright (c) 2000-2016 Ericsson Telecom AB
// You may modify this file. Add your attributes and prototypes of your // You may modify this file. Add your attributes and prototypes of your
// member functions here. // member functions here.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment