summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2010-10-31 02:12:18 +0200
committerAraq <rumpf_a@web.de>2010-10-31 02:12:18 +0200
commit5055d307535e5e05e3ec5630107080a9aefbf2ea (patch)
tree926e9a83986c54fa7ceb2ba0923ab9439bd75a1c
parentec67d98286fcc8c550c6c747c937c5a8fceac749 (diff)
downloadNim-5055d307535e5e05e3ec5630107080a9aefbf2ea.tar.gz
added os.findExe
-rwxr-xr-xlib/pure/os.nim13
-rwxr-xr-xtools/nimrepl.nim12
-rwxr-xr-xweb/news.txt1
3 files changed, 14 insertions, 12 deletions
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index a1dd5450d..229fad441 100755
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -1231,4 +1231,17 @@ proc getFileSize*(file: string): biggestInt {.rtl, extern: "nos$1".} =
       close(f)
     else: OSError()
 
+proc findExe*(exe: string): string = 
+  ## Searches for `exe` in the current working directory and then
+  ## in directories listed in the ``PATH`` environment variable. 
+  ## Returns "" if the `exe` cannot be found. On DOS-like platforms, `exe` 
+  ## is added an ``.exe`` file extension if it has no extension.
+  result = addFileExt(exe, os.exeExt)
+  if ExistsFile(result): return
+  var path = os.getEnv("PATH")
+  for candidate in split(path, pathSep): 
+    var x = candidate / result
+    if ExistsFile(x): return x
+  result = ""
+
 {.pop.}
diff --git a/tools/nimrepl.nim b/tools/nimrepl.nim
index 989689add..432ca1356 100755
--- a/tools/nimrepl.nim
+++ b/tools/nimrepl.nim
@@ -14,18 +14,6 @@ when defined(tinyc):
 else:
   const runCmd = "c -r"
 
-when not defined(findExe): 
-  # candidate for the stdlib:
-  proc findExe(exe: string): string = 
-    ## returns exe if the exe cannot be found
-    result = addFileExt(exe, os.exeExt)
-    if ExistsFile(result): return
-    var path = os.getEnv("PATH")
-    for candidate in split(path, pathSep): 
-      var x = candidate / result
-      if ExistsFile(x): return x
-    result = ""
-
 var nimExe = findExe("nimrod")
 if nimExe.len == 0: nimExe = "../bin" / addFileExt("nimrod", os.exeExt)
 
diff --git a/web/news.txt b/web/news.txt
index 9569a9cc3..af0ce1fbd 100755
--- a/web/news.txt
+++ b/web/news.txt
@@ -17,6 +17,7 @@ Additions
 ---------
 
 - Added ``re.findAll``, ``pegs.findAll``.
+- Added ``os.findExe``.
 
 
 2010-10-20 Version 0.8.10 released
21 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548