← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/spl/oneiric

« back to all changes in this revision

Viewing changes to clib.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2007-11-21 19:12:02 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071121191202-qvdw2cqfh8rwk160
Tags: 1.0~pre4-1ubuntu1
https://launchpad.net/bugs/181166
* Merge from Debian unstable (LP: #181166), Ubuntu remaining changes:
  - Change build-depends from
    libcurl3-gnutls-dev to libcurl4-gnutls-dev
* Modify Maintainer value to match Debian-Maintainer-Field Spec

Show diffs side-by-side

added added

removed removed

Lines of Context:
clib.c
25
25
#include <string.h>
26
26
#include <unistd.h>
27
27
#include <stdarg.h>
28
 
#include <glob.h>
 
28
 
 
29
#ifndef USEWIN32API
 
30
#  include <glob.h>
 
31
#endif
29
32
 
30
33
#ifndef USEWIN32API
31
34
#  include <dlfcn.h>
515
518
                                nl = strchr(line, '\r');
516
519
                                if (nl) *nl = 0;
517
520
 
 
521
#ifndef USEWIN32API
518
522
                                glob_t globbuf;
519
523
                                if (glob(line, 0, NULL, &globbuf) == 0)
520
524
                                        for (int i=0; globbuf.gl_pathv[i]; i++) {
523
527
                                                        goto leave;
524
528
                                        }
525
529
                                globfree(&globbuf);
 
530
#else
 
531
                                ret = try_module_load_dir(vm, line, name, restore);
 
532
                                if (ret <= 0)
 
533
                                        goto leave;
 
534
#endif
526
535
                        }
527
536
 
528
537
                        fclose(f);