solcjs: Enable import callback without base path (except for --standard-json mode)

Author: cameel

solcjs

@@ -36,7 +36,8 @@ function abort (msg) {
 }
 
 function readFileCallback(sourcePath) {
-  sourcePath = program.basePath + '/' + sourcePath;
+  if (program.basePath)
+    sourcePath = program.basePath + '/' + sourcePath;
   if (fs.existsSync(sourcePath)) {
     try {
       return { 'contents': fs.readFileSync(sourcePath).toString('utf8') }
@@ -75,7 +76,7 @@ function stripBasePath(sourcePath) {
 }
 
 var callbacks = undefined
-if (program.basePath)
+if (program.basePath || !program.standardJson)
   callbacks = {'import': readFileCallback};
 
 if (program.standardJson) {

test/cli.js

@@ -69,9 +69,7 @@ tape('CLI', function (t) {
       './solcjs --bin ' +
         'test/resources/importA.sol ' +
         './test/resources//importA.sol ' +
-        path.resolve('test/resources/importA.sol') + ' ' +
-        // Adding importB explicitly here should make compiler find it despite the lack of callback
-        'test/resources/importB.sol '
+        path.resolve('test/resources/importA.sol')
     );
     spt.stderr.empty();
     spt.succeeds();