Browse Source

Refactor copying of on-calc names into DecodeOnCalcName so urldecoding can be added into a single place.

git-svn-id: file:///var/svn/tigccpp/trunk@1159 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 years ago
parent
commit
eec856e80e
2 changed files with 9 additions and 4 deletions
  1. 5 0
      tigcc/ld-tigcc/main.c
  2. 4 4
      tigcc/ld-tigcc/main_opt.inc

+ 5 - 0
tigcc/ld-tigcc/main.c

@@ -74,6 +74,11 @@ EXP_LINK_FILES ()
 	const char **CurFile;
 	BOOLEAN IsArchive;
 #else /* !TARGET_EMBEDDED */
+static void DecodeOnCalcName(char *Dest, const char *Src)
+{
+	strncpy (Dest, Src, MAX_NAME_LEN);
+}
+
 int main (int ArgCount, const char **Args)
 {
 	OPTIMIZE_INFO _OptimizeInfo;

+ 4 - 4
tigcc/ld-tigcc/main_opt.inc

@@ -243,7 +243,7 @@
 						{
 							Name++;
 							// Extract folder name.
-							strncpy (ProgramFolder, Args [CurArg], MAX_NAME_LEN);
+							DecodeOnCalcName (ProgramFolder, Args [CurArg]);
 							{
 								char *S;
 								for (S = ProgramFolder; *S; S++)
@@ -260,7 +260,7 @@
 						}
 						else
 							Name = Args [CurArg];
-						strncpy (ProgramName, Name, MAX_NAME_LEN);
+						DecodeOnCalcName (ProgramName, Name);
 						{
 							char *S;
 							for (S = ProgramName; *S; S++)
@@ -283,7 +283,7 @@
 						{
 							Name++;
 							// Extract folder name.
-							strncpy (DataFolder, Args [CurArg], MAX_NAME_LEN);
+							DecodeOnCalcName (DataFolder, Args [CurArg]);
 							{
 								char *S;
 								for (S = DataFolder; *S; S++)
@@ -304,7 +304,7 @@
 							Name = Args [CurArg];
 							*DataVarString = 0;
 						}
-						strncpy (DataName, Name, MAX_NAME_LEN);
+						DecodeOnCalcName (DataName, Name);
 						{
 							char *S;
 							for (S = DataName; *S; S++)